Bug 818800 - Remove the global private browsing service in per-window PB builds; r=jdm

browser/components/build/nsModule.cpp

@@ -25,7 +25,9 @@
 #include "AboutRedirector.h"
 #include "nsIAboutModule.h"
 
+#ifndef MOZ_PER_WINDOW_PRIVATE_BROWSING
 #include "nsPrivateBrowsingServiceWrapper.h"
+#endif
 #include "nsNetCID.h"
 
 using namespace mozilla::browser;
@@ -47,7 +49,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
 
+#ifndef MOZ_PER_WINDOW_PRIVATE_BROWSING
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrivateBrowsingServiceWrapper, Init)
+#endif
 
 NS_DEFINE_NAMED_CID(NS_BROWSERDIRECTORYPROVIDER_CID);
 #if defined(XP_WIN)
@@ -62,7 +66,9 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUMERATOR_CID);
 #elif defined(XP_MACOSX)
 NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
 #endif
+#ifndef MOZ_PER_WINDOW_PRIVATE_BROWSING
 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
+#endif
 
 static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
@@ -78,7 +84,9 @@ static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
 #elif defined(XP_MACOSX)
     { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
 #endif
+#ifndef MOZ_PER_WINDOW_PRIVATE_BROWSING
     { &kNS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID, false, NULL, nsPrivateBrowsingServiceWrapperConstructor },
+#endif
     { NULL }
 };
 
@@ -113,7 +121,9 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
 #elif defined(XP_MACOSX)
     { NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID },
 #endif
+#ifndef MOZ_PER_WINDOW_PRIVATE_BROWSING
     { NS_PRIVATE_BROWSING_SERVICE_CONTRACTID, &kNS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID },
+#endif
     { NULL }
 };