Bug 1476306 - Moving NullPrincipal/ContentPrincipal/SystemPrincipal under mozilla namespace - part 2 - SystemPrincipal, r=ckerschb

caps/SystemPrincipal.cpp

@@ -18,6 +18,8 @@
 #include "nsIScriptSecurityManager.h"
 #include "pratom.h"
 
+using namespace mozilla;
+
 NS_IMPL_CLASSINFO(SystemPrincipal, nullptr,
                   nsIClassInfo::SINGLETON | nsIClassInfo::MAIN_THREAD_ONLY,
                   NS_SYSTEMPRINCIPAL_CID)

caps/SystemPrincipal.h

@@ -6,8 +6,8 @@
 
 /* The privileged system principal. */
 
-#ifndef SystemPrincipal_h
-#define SystemPrincipal_h
+#ifndef mozilla_SystemPrincipal_h
+#define mozilla_SystemPrincipal_h
 
 #include "nsIPrincipal.h"
 #include "nsJSPrincipals.h"
@@ -19,8 +19,9 @@
 { 0xb7, 0x65, 0x0, 0x60, 0xb0, 0xb6, 0xce, 0xcb }}
 #define NS_SYSTEMPRINCIPAL_CONTRACTID "@mozilla.org/systemprincipal;1"
 
+namespace mozilla {
 
-class SystemPrincipal final : public mozilla::BasePrincipal
+class SystemPrincipal final : public BasePrincipal
 {
   SystemPrincipal()
     : BasePrincipal(eSystemPrincipal)
@@ -63,4 +64,6 @@ protected:
   }
 };
 
-#endif // SystemPrincipal_h
+} // mozilla namespace
+
+#endif // mozilla_SystemPrincipal_h

caps/moz.build

@@ -27,7 +27,6 @@ EXPORTS += [
     'ContentPrincipal.h',
     'nsJSPrincipals.h',
     'nsScriptSecurityManager.h',
-    'SystemPrincipal.h',
 ]
 
 EXPORTS.mozilla = [
@@ -35,6 +34,7 @@ EXPORTS.mozilla = [
     'NullPrincipal.h',
     'NullPrincipalURI.h',
     'OriginAttributes.h',
+    'SystemPrincipal.h',
 ]
 
 SOURCES += [

caps/nsScriptSecurityManager.h

@@ -21,10 +21,10 @@
 
 class nsIIOService;
 class nsIStringBundle;
-class SystemPrincipal;
 
 namespace mozilla {
 class OriginAttributes;
+class SystemPrincipal;
 } // namespace mozilla
 
 /////////////////////////////
@@ -50,7 +50,7 @@ public:
     // Invoked exactly once, by XPConnect.
     static void InitStatics();
 
-    static already_AddRefed<SystemPrincipal>
+    static already_AddRefed<mozilla::SystemPrincipal>
     SystemPrincipalSingletonConstructor();
 
     /**

js/xpconnect/loader/mozJSSubScriptLoader.cpp

@@ -16,7 +16,6 @@
 #include "nsNetUtil.h"
 #include "nsIFileURL.h"
 #include "ContentPrincipal.h"
-#include "SystemPrincipal.h"
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
@@ -28,6 +27,7 @@
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/ScriptPreloader.h"
+#include "mozilla/SystemPrincipal.h"
 #include "mozilla/scache/StartupCache.h"
 #include "mozilla/scache/StartupCacheUtils.h"
 #include "mozilla/Unused.h"

js/xpconnect/src/XPCJSContext.cpp

@@ -48,6 +48,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/ProcessHangMonitor.h"
 #include "mozilla/Sprintf.h"
+#include "mozilla/SystemPrincipal.h"
 #include "mozilla/ThreadLocal.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/Unused.h"
@@ -60,7 +61,6 @@
 #include "nsIXULRuntime.h"
 #include "nsJSPrincipals.h"
 #include "ExpandedPrincipal.h"
-#include "SystemPrincipal.h"
 
 #if defined(XP_LINUX) && !defined(ANDROID)
 // For getrlimit and min/max.

layout/build/nsLayoutModule.cpp

@@ -101,8 +101,8 @@ using mozilla::dom::AudioChannelAgent;
 #include "nsScriptSecurityManager.h"
 #include "ContentPrincipal.h"
 #include "ExpandedPrincipal.h"
-#include "SystemPrincipal.h"
 #include "mozilla/NullPrincipal.h"
+#include "mozilla/SystemPrincipal.h"
 #include "nsNetCID.h"
 #if defined(MOZ_WIDGET_ANDROID)
 #include "nsHapticFeedback.h"

toolkit/components/extensions/webrequest/ChannelWrapper.cpp

@@ -10,7 +10,7 @@
 #include "xpcpublic.h"
 
 #include "mozilla/BasePrincipal.h"
-#include "SystemPrincipal.h"
+#include "mozilla/SystemPrincipal.h"
 
 #include "NSSErrorsService.h"
 #include "nsITransportSecurityInfo.h"