Bug 845063 - Remove the dummy global private browsing service; r=jdm

--HG--
extra : rebase_source : 400d1240f8cb016d4183c64cab353a753b3fe74d

b2g/installer/package-manifest.in

@@ -363,8 +363,6 @@
 @BINPATH@/components/nsSetDefaultBrowser.manifest
 @BINPATH@/components/nsSetDefaultBrowser.js
 @BINPATH@/components/BrowserPlaces.manifest
-@BINPATH@/components/nsPrivateBrowsingService.manifest
-@BINPATH@/components/nsPrivateBrowsingService.js
 @BINPATH@/components/toolkitsearch.manifest
 @BINPATH@/components/nsTryToClose.manifest
 @BINPATH@/components/nsTryToClose.js

browser/components/privatebrowsing/Makefile.in

@@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = privatebrowsing
 
-DIRS = src
-
 TEST_DIRS += test
 
 include $(topsrcdir)/config/rules.mk

browser/components/privatebrowsing/src/Makefile.in

@@ -1,23 +0,0 @@
-# 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/.
-
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = privatebrowsing
-LIBRARY_NAME = privatebrowsing_s
-
-FORCE_STATIC_LIB = 1
-USE_STATIC_LIBS = 1
-
-EXTRA_COMPONENTS = \
-  nsPrivateBrowsingServiceObsolete.manifest \
-  nsPrivateBrowsingServiceObsolete.js \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk

browser/components/privatebrowsing/src/nsPrivateBrowsingServiceObsolete.js

@@ -1,21 +0,0 @@
-/* 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/. */
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-const Ci = Components.interfaces;
-
-// This dummy object just emulates the old nsIPrivateBrowsingService, and is
-// non-functional in every aspect.  It is only used to make Jetpack work
-// again.
-
-function PrivateBrowsingService() {
-}
-
-PrivateBrowsingService.prototype = {
-  classID: Components.ID("{ba0e4d3d-7be2-41a0-b723-a7c16b22ebe9}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrivateBrowsingService])
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PrivateBrowsingService]);

browser/components/privatebrowsing/src/nsPrivateBrowsingServiceObsolete.manifest

@@ -1,15 +0,0 @@
-# WebappRT doesn't need these instructions, and they don't necessarily work
-# with it, but it does use a GRE directory that the GRE shares with Firefox,
-# so in order to prevent the instructions from being processed for WebappRT,
-# we need to restrict them to the applications that depend on them, i.e.:
-#
-#   b2g:            {3c2e2abc-06d4-11e1-ac3b-374f68613e61}
-#   browser:        {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-#   mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110}
-#   mobile/xul:     {a23983c0-fd0e-11dc-95ff-0800200c9a66}
-#
-# In theory we should do this for all these instructions, but in practice it is
-# sufficient to do it for the app-startup one, and the file is simpler that way.
-
-component {ba0e4d3d-7be2-41a0-b723-a7c16b22ebe9} nsPrivateBrowsingServiceObsolete.js
-contract @mozilla.org/privatebrowsing;1 {ba0e4d3d-7be2-41a0-b723-a7c16b22ebe9}

browser/installer/package-manifest.in

@@ -349,8 +349,6 @@
 @BINPATH@/browser/components/DownloadsUI.js
 @BINPATH@/browser/components/BrowserPlaces.manifest
 @BINPATH@/components/BrowserPageThumbs.manifest
-@BINPATH@/browser/components/nsPrivateBrowsingServiceObsolete.manifest
-@BINPATH@/browser/components/nsPrivateBrowsingServiceObsolete.js
 @BINPATH@/components/SiteSpecificUserAgent.js
 @BINPATH@/components/SiteSpecificUserAgent.manifest
 @BINPATH@/components/toolkitsearch.manifest

mobile/android/installer/package-manifest.in

@@ -278,8 +278,6 @@
 @BINPATH@/components/nsBrowserGlue.js
 @BINPATH@/components/nsSetDefaultBrowser.manifest
 @BINPATH@/components/nsSetDefaultBrowser.js
-@BINPATH@/components/nsPrivateBrowsingService.manifest
-@BINPATH@/components/nsPrivateBrowsingService.js
 @BINPATH@/components/toolkitsearch.manifest
 @BINPATH@/components/nsSearchService.js
 @BINPATH@/components/nsSearchSuggestions.js

mobile/xul/installer/package-manifest.in

@@ -320,8 +320,6 @@
 @BINPATH@/components/nsSetDefaultBrowser.manifest
 @BINPATH@/components/nsSetDefaultBrowser.js
 @BINPATH@/components/BrowserPlaces.manifest
-@BINPATH@/components/nsPrivateBrowsingService.manifest
-@BINPATH@/components/nsPrivateBrowsingService.js
 @BINPATH@/components/toolkitsearch.manifest
 @BINPATH@/components/nsSearchService.js
 @BINPATH@/components/nsSearchSuggestions.js

netwerk/base/public/Makefile.in

@@ -62,7 +62,6 @@ XPIDLSRCS	= \
 		nsIPermission.idl \
 		nsIPermissionManager.idl \
 		nsIPrivateBrowsingChannel.idl \
-		nsIPrivateBrowsingServiceObsolete.idl \
 		nsIProgressEventSink.idl \
 		nsIPrompt.idl \
 		nsIProtocolProxyService.idl \

netwerk/base/public/nsIPrivateBrowsingServiceObsolete.idl

@@ -1,16 +0,0 @@
-/* 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 "nsISupports.idl"
-
-[scriptable, uuid(7ad4b7f1-5a88-41aa-9b40-713009bc57b3)]
-interface nsIPrivateBrowsingService : nsISupports
-{
-  // This space is intentionally left blank!
-
-  // This is a remnant from the old dying global private browsing service.
-  // You should fix your code to not rely on this interface, as it will
-  // be removed completely soon.
-};
-