import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1101651 - Part 3: Update cppunitest.ini file. r=dminor (ee84778e0)
- Bug 1177887 - Deref *after* changing the value held by RefPtr. - r=waldo (d5171f34a)
- Bug 1119086 - already_AddRefed should define copy/move assignment operators. r=nfroyd (9e4431f30)
- Bug 1155059: Patch 0 - add do_AddRef() r=froydnj (b128156c9)
- Bug 1096093 - Add infrastructure for LookAndFeel metric caching, and allowing the parent process to send down cache to content process. r=jimm. (1c45a3b01)
- Bug 1153988 - create nsNullPrincipals directly, rather than going through do_CreateInstance; r=smaug (bf6f60873)
- Bug 1149280 part 1. Make nullprincipal creation faster. r=smaug (0ebf3b6c5)
- Bug 1149280 part 2. Drop the useless mScheme member of nsNullPrincipalURI. r=smaug (a3e0f165d)
- Bug 1162412 - Part 1 - don't treat plain facingMode constraint as required. r=jesup (8a2bd8ed4)
- Bug 1162412 - Part 2 - order devices by shortest fitness distance. r=jesup (a24175d0b)
- Bug 1162412 - Part 3 - treat plain values as exact in advanced. r=jesup (6a81a6126)
- Bug 1161433: reject empty gUM contraints with NotSupportedError. r=jib (e92264c39)
- Bug 1162720 - Test enumerateDevices. r=jesup, r=drno (495754307)
- Bug 1162720 - Rename CallbackRunnable::New to NewRunnableFrom. r=jesup (2b6dad718)
- Bug 1164292 - Hoist refcounting into nsJSPrincipals. r=gabor (0fe536dcc)
- Bug 1150045 - De-anonymize Expanded Principals. r=bholley (c469e4155)
- Bug 1132745 part 1: remove music.baidu.com from CSSUnprefixingService whitelist. r=miketaylr (e4088e511)
- Bug 1132745 part 2: Add Mozilla China team's requested additional domains to CSSUnprefixingService whitelist. r=miketaylr (3c5272527)
- Bug 1132745 followup: Fix a typo in a CSS Unprefixing Service whitelisted domain. (no review) (1c4dfb146)
- Bug 1162106: Add top .jp sites to CSS unprefixing service whitelist. r=dholbert (484868159)
- Bug 1164292 - Re-implement dumpImpl in terms of GetScriptLocation. r=gabor (da8dca812)
- Bug 1164292 - Rebrand nsBasePrincipal into mozilla::BasePrincipal and give it its own file. r=gabor (aa316e820)
- Bug 1164292 - Make all nsIPrincipal implementations inherit BasePrincipal and hoist some repeated code. r=gabor (47ec1edc8)
- Bug 1164292 - Switch nsIPrincipal::origin to ACString. r=gabor (55fd6ffda)
- rearrange code (2e750c960)
- Bug 1157898 part 2. Make code of the form "NS_ENSURE_SUCCESS(rv.ErrorCode(), rv.ErrorCode());" use Failed and StealNSResult instead. r=peterv (359a431d6)
- Bug 1157898 part 5. Eliminate the remaining non-ErrorResult consumers of ErrorResult::ErrorCode and make it protected. r=peterv (89364a5ef)
- Bug 1158557 - Don't throttle rAF for documents with live static clones. r=smaug (8b11781df)
- Bug 1152551, part 1 - Remove leading tabs in dom/. r=baku (1853422ea)
- Bug 1150064, part 1 - Implement the Animation.finish() method. r=birtles, r=smaug (72ca03012)
- Bug 1150064, part 2 - Add Web Platform tests for the Animation.finish() method. r=birtles (05e90625d)
- Bug 1150807 part 1 - Fix SilentlySetCurrentTime to not set the start time when it is unresolved; r=jwatt (bc8f471ec)
- Bug 1150807 part 2 - Expose Animation::Cancel in WebIDL; r=smaug (f32332d44)
- Bug 1150807 part 3 - Call PostUpdate from Cancel; r=jwatt (391f56488)
- Bug 1150807 part 4 - Don't play/pause an idle animation when animation-play-state changes; r=jwatt (5eed021af)
- Bug 1150807 part 5 - Tests for Animation.cancel(); r=jwatt (ad6776e1d)
- Bug 1157989 part 1 - Line up methods in dom/animation/Animation with the API; r=jwatt (dc8874f43)
- Bug 1157989 part 2 - Make Silently* methods protected; r=jwatt (7039f1aaa)
- Bug 1157989 part 3 - Make LimitBehavior enum a scoped enum; r=jwatt (ffd876b36)
- Bug 1157989 part 4 - Make method comment style consistent; r=jwatt (e656f44ae)

caps/BasePrincipal.cpp

@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sw=2 et tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/BasePrincipal.h"
+
+namespace mozilla {
+
+NS_IMETHODIMP
+BasePrincipal::GetCsp(nsIContentSecurityPolicy** aCsp)
+{
+  NS_IF_ADDREF(*aCsp = mCSP);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::SetCsp(nsIContentSecurityPolicy* aCsp)
+{
+  // If CSP was already set, it should not be destroyed!  Instead, it should
+  // get set anew when a new principal is created.
+  if (mCSP)
+    return NS_ERROR_ALREADY_INITIALIZED;
+
+  mCSP = aCsp;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetIsNullPrincipal(bool* aIsNullPrincipal)
+{
+  *aIsNullPrincipal = false;
+  return NS_OK;
+}
+
+
+} // namespace mozilla