-#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
&privatebrowsingpage.perwindow.issueDesc;
&privatebrowsingpage.perwindow.issueDesc.normal;
-#else -&privatebrowsingpage.issueDesc;
-&privatebrowsingpage.issueDesc.normal;
-#endif
-#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
&privatebrowsingpage.perwindow.description;
-#else -&privatebrowsingpage.description;
-#endif
-#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
-#else
-
-#endif
diff --git a/browser/components/privatebrowsing/src/Makefile.in b/browser/components/privatebrowsing/src/Makefile.in
index b4fb5b44a23c..789cea98f958 100644
--- a/browser/components/privatebrowsing/src/Makefile.in
+++ b/browser/components/privatebrowsing/src/Makefile.in
@@ -15,29 +15,9 @@ LIBRARY_NAME = privatebrowsing_s
FORCE_STATIC_LIB = 1
USE_STATIC_LIBS = 1
-ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
-
EXTRA_COMPONENTS = \
nsPrivateBrowsingServiceObsolete.manifest \
nsPrivateBrowsingServiceObsolete.js \
$(NULL)
-else
-
-CPPSRCS = \
- nsPrivateBrowsingServiceWrapper.cpp \
- $(NULL)
-
-LOCAL_INCLUDES = -I$(srcdir)/../../build
-
-EXTRA_COMPONENTS = \
- nsPrivateBrowsingService.manifest \
- $(NULL)
-
-EXTRA_PP_COMPONENTS = \
- nsPrivateBrowsingService.js \
- $(NULL)
-
-endif
-
include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js b/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
deleted file mode 100644
index 21d85fa004cf..000000000000
--- a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
+++ /dev/null
@@ -1,593 +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");
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-#ifndef XP_WIN
-#define BROKEN_WM_Z_ORDER
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-const Cr = Components.results;
-
-const STATE_IDLE = 0;
-const STATE_TRANSITION_STARTED = 1;
-const STATE_WAITING_FOR_RESTORE = 2;
-const STATE_RESTORE_FINISHED = 3;
-
-////////////////////////////////////////////////////////////////////////////////
-//// PrivateBrowsingService
-
-function PrivateBrowsingService() {
- this._obs = Cc["@mozilla.org/observer-service;1"].
- getService(Ci.nsIObserverService);
- this._obs.addObserver(this, "profile-after-change", true);
- this._obs.addObserver(this, "quit-application-granted", true);
- this._obs.addObserver(this, "private-browsing", true);
- this._obs.addObserver(this, "command-line-startup", true);
- this._obs.addObserver(this, "sessionstore-browser-state-restored", true);
-
- // List of nsIXULWindows we are going to be closing during the transition
- this._windowsToClose = [];
-}
-
-PrivateBrowsingService.prototype = {
- // Preferences Service
- get _prefs() {
- let prefs = Cc["@mozilla.org/preferences-service;1"].
- getService(Ci.nsIPrefBranch);
- this.__defineGetter__("_prefs", function() prefs);
- return this._prefs;
- },
-
- // Whether the private browsing mode is currently active or not.
- _inPrivateBrowsing: false,
-
- // Saved browser state before entering the private mode.
- _savedBrowserState: null,
-
- // Whether we're in the process of shutting down
- _quitting: false,
-
- // How to treat the non-private session
- _saveSession: true,
-
- // The current status of the private browsing service
- _currentStatus: STATE_IDLE,
-
- // Whether the private browsing mode has been started automatically (ie. always-on)
- _autoStarted: false,
-
- // List of view source window URIs for restoring later
- _viewSrcURLs: [],
-
- // Whether private browsing has been turned on from the command line
- _lastChangedByCommandLine: false,
-
- // Telemetry measurements
- _enterTimestamps: {},
- _exitTimestamps: {},
-
- // XPCOM registration
- classID: Components.ID("{c31f4883-839b-45f6-82ad-a6a9bc5ad599}"),
-
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrivateBrowsingService,
- Ci.nsIObserver,
- Ci.nsISupportsWeakReference,
- Ci.nsICommandLineHandler]),
-
- _unload: function PBS__destroy() {
- // Force an exit from the private browsing mode on shutdown
- this._quitting = true;
- if (this._inPrivateBrowsing)
- this.privateBrowsingEnabled = false;
- },
-
- _setPerWindowPBFlag: function PBS__setPerWindowPBFlag(aWindow, aFlag) {
- aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIWebNavigation)
- .QueryInterface(Ci.nsIDocShellTreeItem)
- .treeOwner
- .QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIXULWindow)
- .docShell.QueryInterface(Ci.nsILoadContext)
- .usePrivateBrowsing = aFlag;
- },
-
- _adjustPBFlagOnExistingWindows: function PBS__adjustPBFlagOnExistingWindows() {
- var windowsEnum = Services.wm.getEnumerator(null);
- while (windowsEnum.hasMoreElements()) {
- var window = windowsEnum.getNext();
- this._setPerWindowPBFlag(window, this._inPrivateBrowsing);
- }
- },
-
- _onBeforePrivateBrowsingModeChange: function PBS__onBeforePrivateBrowsingModeChange() {
- // If we're about to enter PB mode, adjust the flags now
- if (this._inPrivateBrowsing) {
- this._adjustPBFlagOnExistingWindows();
- }
-
- // nothing needs to be done here if we're enabling at startup
- if (!this._autoStarted) {
- let ss = Cc["@mozilla.org/browser/sessionstore;1"].
- getService(Ci.nsISessionStore);
- let blankState = JSON.stringify({
- "windows": [{
- "tabs": [{
- "entries": [{
- "url": "about:blank"
- }]
- }],
- "_closedTabs": []
- }]
- });
-
- if (this._inPrivateBrowsing) {
- // save the whole browser state in order to restore all windows/tabs later
- if (this._saveSession && !this._savedBrowserState) {
- if (this._getBrowserWindow())
- this._savedBrowserState = ss.getBrowserState();
- else // no open browser windows, just restore a blank state on exit
- this._savedBrowserState = blankState;
- }
- }
-
- this._closePageInfoWindows();
-
- // save view-source windows URIs and close them
- let viewSrcWindowsEnum = Services.wm.getEnumerator("navigator:view-source");
- while (viewSrcWindowsEnum.hasMoreElements()) {
- let win = viewSrcWindowsEnum.getNext();
- if (this._inPrivateBrowsing) {
- let plainURL = win.gBrowser.currentURI.spec;
- if (plainURL.indexOf("view-source:") == 0) {
- plainURL = plainURL.substr(12);
- this._viewSrcURLs.push(plainURL);
- }
- }
- win.close();
- }
-
- if (!this._quitting && this._saveSession) {
- let browserWindow = this._getBrowserWindow();
-
- // if there are open browser windows, load a dummy session to get a distinct
- // separation between private and non-private sessions
- if (browserWindow) {
- // set an empty session to transition from/to pb mode, see bug 476463
- ss.setBrowserState(blankState);
-
- // just in case the only remaining window after setBrowserState is different.
- // it probably shouldn't be with the current sessionstore impl, but we shouldn't
- // rely on behaviour the API doesn't guarantee
- browserWindow = this._getBrowserWindow();
- let browser = browserWindow.gBrowser;
-
- // this ensures a clean slate from which to transition into or out of
- // private browsing
- browser.addTab();
- browser.getBrowserForTab(browser.tabContainer.firstChild).stop();
- browser.removeTab(browser.tabContainer.firstChild);
- browserWindow.getInterface(Ci.nsIWebNavigation)
- .QueryInterface(Ci.nsIDocShellTreeItem)
- .treeOwner
- .QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIXULWindow)
- .docShell.contentViewer.resetCloseWindow();
- }
- }
- }
- else
- this._saveSession = false;
-
- // If we're about to leave PB mode, adjust the flags now
- if (!this._inPrivateBrowsing) {
- this._adjustPBFlagOnExistingWindows();
- }
- },
-
- _onAfterPrivateBrowsingModeChange: function PBS__onAfterPrivateBrowsingModeChange() {
- // nothing to do here if we're enabling at startup or the current session is being
- // used
- if (!this._autoStarted && this._saveSession) {
- let ss = Cc["@mozilla.org/browser/sessionstore;1"].
- getService(Ci.nsISessionStore);
- // if we have transitioned out of private browsing mode and the session is
- // to be restored, do it now
- if (!this._inPrivateBrowsing) {
- this._currentStatus = STATE_WAITING_FOR_RESTORE;
- if (!this._getBrowserWindow()) {
- ss.init(null);
- }
- ss.setBrowserState(this._savedBrowserState);
- this._savedBrowserState = null;
-
- this._closePageInfoWindows();
-
- // re-open all view-source windows
- let windowWatcher = Cc["@mozilla.org/embedcomp/window-watcher;1"].
- getService(Ci.nsIWindowWatcher);
- this._viewSrcURLs.forEach(function(uri) {
- let args = Cc["@mozilla.org/supports-array;1"].
- createInstance(Ci.nsISupportsArray);
- let str = Cc["@mozilla.org/supports-string;1"].
- createInstance(Ci.nsISupportsString);
- str.data = uri;
- args.AppendElement(str);
- args.AppendElement(null); // charset
- args.AppendElement(null); // page descriptor
- args.AppendElement(null); // line number
- let forcedCharset = Cc["@mozilla.org/supports-PRBool;1"].
- createInstance(Ci.nsISupportsPRBool);
- forcedCharset.data = false;
- args.AppendElement(forcedCharset);
- windowWatcher.openWindow(null, "chrome://global/content/viewSource.xul",
- "_blank", "all,dialog=no", args);
- });
- this._viewSrcURLs = [];
- }
- else {
- // otherwise, if we have transitioned into private browsing mode, load
- // about:privatebrowsing
- let privateBrowsingState = {
- "windows": [{
- "tabs": [{
- "entries": [{
- "url": "about:privatebrowsing"
- }]
- }],
- "_closedTabs": []
- }]
- };
- // Transition into private browsing mode
- this._currentStatus = STATE_WAITING_FOR_RESTORE;
- if (!this._getBrowserWindow()) {
- ss.init(null);
- }
- ss.setBrowserState(JSON.stringify(privateBrowsingState));
- }
- }
- },
-
- _notifyIfTransitionComplete: function PBS__notifyIfTransitionComplete() {
- switch (this._currentStatus) {
- case STATE_TRANSITION_STARTED:
- // no session store operation was needed, so just notify of transition completion
- case STATE_RESTORE_FINISHED:
- // restore has been completed
- this._currentStatus = STATE_IDLE;
- this._obs.notifyObservers(null, "private-browsing-transition-complete", "");
- this._recordTransitionTime("completed");
- break;
- case STATE_WAITING_FOR_RESTORE:
- // too soon to notify...
- break;
- case STATE_IDLE:
- // no need to notify
- break;
- default:
- // unexpected state observed
- Cu.reportError("Unexpected private browsing status reached: " +
- this._currentStatus);
- break;
- }
- },
-
- _recordTransitionTime: function PBS__recordTransitionTime(aPhase) {
- // To record the time spent in private browsing transitions, note that we
- // cannot use the TelemetryStopwatch module, because it reports its results
- // immediately when the timer is stopped. In this case, we need to delay
- // the actual histogram update after we are out of private browsing mode.
- if (this._inPrivateBrowsing) {
- this._enterTimestamps[aPhase] = Date.now();
- } else {
- if (this._quitting) {
- // If we are quitting the browser, we don't care collecting the data,
- // because we wouldn't be able to record it with telemetry.
- return;
- }
- this._exitTimestamps[aPhase] = Date.now();
- if (aPhase == "completed") {
- // After we finished exiting the private browsing mode, we can finally
- // record the telemetry data, for the enter and the exit processes.
- this._reportTelemetry();
- }
- }
- },
-
- _reportTelemetry: function PBS__reportTelemetry() {
- function reportTelemetryEntry(aHistogramId, aValue) {
- try {
- Services.telemetry.getHistogramById(aHistogramId).add(aValue);
- } catch (ex) {
- Cu.reportError(ex);
- }
- }
-
- reportTelemetryEntry(
- "PRIVATE_BROWSING_TRANSITION_ENTER_PREPARATION_MS",
- this._enterTimestamps.prepared - this._enterTimestamps.started);
- reportTelemetryEntry(
- "PRIVATE_BROWSING_TRANSITION_ENTER_TOTAL_MS",
- this._enterTimestamps.completed - this._enterTimestamps.started);
- reportTelemetryEntry(
- "PRIVATE_BROWSING_TRANSITION_EXIT_PREPARATION_MS",
- this._exitTimestamps.prepared - this._exitTimestamps.started);
- reportTelemetryEntry(
- "PRIVATE_BROWSING_TRANSITION_EXIT_TOTAL_MS",
- this._exitTimestamps.completed - this._exitTimestamps.started);
- },
-
- _canEnterPrivateBrowsingMode: function PBS__canEnterPrivateBrowsingMode() {
- let cancelEnter = Cc["@mozilla.org/supports-PRBool;1"].
- createInstance(Ci.nsISupportsPRBool);
- cancelEnter.data = false;
- this._obs.notifyObservers(cancelEnter, "private-browsing-cancel-vote", "enter");
- return !cancelEnter.data;
- },
-
- _canLeavePrivateBrowsingMode: function PBS__canLeavePrivateBrowsingMode() {
- let cancelLeave = Cc["@mozilla.org/supports-PRBool;1"].
- createInstance(Ci.nsISupportsPRBool);
- cancelLeave.data = false;
- this._obs.notifyObservers(cancelLeave, "private-browsing-cancel-vote", "exit");
- if (!cancelLeave.data) {
- this._obs.notifyObservers(cancelLeave, "last-pb-context-exiting", null);
- }
- return !cancelLeave.data;
- },
-
- _getBrowserWindow: function PBS__getBrowserWindow() {
- var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
- getService(Ci.nsIWindowMediator);
-
- var win = wm.getMostRecentWindow("navigator:browser");
-
- // We don't just return |win| now because of bug 528706.
-
- if (!win)
- return null;
- if (!win.closed)
- return win;
-
-#ifdef BROKEN_WM_Z_ORDER
- win = null;
- var windowsEnum = wm.getEnumerator("navigator:browser");
- // this is oldest to newest, so this gets a bit ugly
- while (windowsEnum.hasMoreElements()) {
- let nextWin = windowsEnum.getNext();
- if (!nextWin.closed)
- win = nextWin;
- }
- return win;
-#else
- var windowsEnum = wm.getZOrderDOMWindowEnumerator("navigator:browser", true);
- while (windowsEnum.hasMoreElements()) {
- win = windowsEnum.getNext();
- if (!win.closed)
- return win;
- }
- return null;
-#endif
- },
-
- _ensureCanCloseWindows: function PBS__ensureCanCloseWindows() {
- // whether we should save and close the current session
- this._saveSession = true;
- try {
- if (this._prefs.getBoolPref("browser.privatebrowsing.keep_current_session")) {
- this._saveSession = false;
- return;
- }
- } catch (ex) {}
-
- let windowMediator = Cc["@mozilla.org/appshell/window-mediator;1"].
- getService(Ci.nsIWindowMediator);
- let windowsEnum = windowMediator.getEnumerator("navigator:browser");
-
- while (windowsEnum.hasMoreElements()) {
- let win = windowsEnum.getNext();
- if (win.closed)
- continue;
- let xulWin = win.QueryInterface(Ci.nsIInterfaceRequestor).
- getInterface(Ci.nsIWebNavigation).
- QueryInterface(Ci.nsIDocShellTreeItem).
- treeOwner.QueryInterface(Ci.nsIInterfaceRequestor).
- getInterface(Ci.nsIXULWindow);
- if (xulWin.docShell.contentViewer.permitUnload(true))
- this._windowsToClose.push(xulWin);
- else
- throw Cr.NS_ERROR_ABORT;
- }
- },
-
- _closePageInfoWindows: function PBS__closePageInfoWindows() {
- let pageInfoEnum = Cc["@mozilla.org/appshell/window-mediator;1"].
- getService(Ci.nsIWindowMediator).
- getEnumerator("Browser:page-info");
- while (pageInfoEnum.hasMoreElements()) {
- let win = pageInfoEnum.getNext();
- win.close();
- }
- },
-
- // nsIObserver
-
- observe: function PBS_observe(aSubject, aTopic, aData) {
- switch (aTopic) {
- case "profile-after-change":
- // If the autostart prefs has been set, simulate entering the
- // private browsing mode upon startup.
- // This won't interfere with the session store component, because
- // that component will be initialized on final-ui-startup.
- if (!this._autoStarted) {
- this._autoStarted = this._prefs.getBoolPref("browser.privatebrowsing.autostart");
- if (this._autoStarted)
- this.privateBrowsingEnabled = true;
- }
- this._obs.removeObserver(this, "profile-after-change");
- break;
- case "quit-application-granted":
- this._unload();
- break;
- case "private-browsing":
- if (!this._inPrivateBrowsing) {
- // Clear the error console
- let consoleService = Cc["@mozilla.org/consoleservice;1"].
- getService(Ci.nsIConsoleService);
- consoleService.logStringMessage(null); // trigger the listeners
- consoleService.reset();
- }
- break;
- case "command-line-startup":
- this._obs.removeObserver(this, "command-line-startup");
- aSubject.QueryInterface(Ci.nsICommandLine);
-#ifndef MOZ_PER_WINDOW_PRIVATE_BROWSING
- if (aSubject.findFlag("private", false) >= 0) {
- // Don't need to go into PB mode if it's already set to autostart
- if (this._autoStarted)
- aSubject.handleFlag("private", false);
-
- this.privateBrowsingEnabled = true;
- this._autoStarted = true;
- this._lastChangedByCommandLine = true;
- }
- else
-#endif
- if (aSubject.findFlag("private-toggle", false) >= 0) {
- this._lastChangedByCommandLine = true;
- }
- break;
- case "sessionstore-browser-state-restored":
- if (this._currentStatus == STATE_WAITING_FOR_RESTORE) {
- this._currentStatus = STATE_RESTORE_FINISHED;
- this._notifyIfTransitionComplete();
- }
- break;
- }
- },
-
- // nsICommandLineHandler
-
- handle: function PBS_handle(aCmdLine) {
-#ifndef MOZ_PER_WINDOW_PRIVATE_BROWSING
- if (aCmdLine.handleFlag("private", false))
- aCmdLine.preventDefault = true; // It has already been handled
- else
-#endif
- if (aCmdLine.handleFlag("private-toggle", false)) {
- if (this._autoStarted) {
- throw Cr.NS_ERROR_ABORT;
- }
- this.privateBrowsingEnabled = !this.privateBrowsingEnabled;
- this._lastChangedByCommandLine = true;
- }
- },
-
- get helpInfo() {
- return " -private Enable private browsing mode.\n" +
- " -private-toggle Toggle private browsing mode.\n";
- },
-
- // nsIPrivateBrowsingService
-
- /**
- * Return the current status of private browsing.
- */
- get privateBrowsingEnabled() {
- return this._inPrivateBrowsing;
- },
-
- /**
- * Enter or leave private browsing mode.
- */
- set privateBrowsingEnabled(val) {
- // Allowing observers to set the private browsing status from their
- // notification handlers is not desired, because it will change the
- // status of the service while it's in the process of another transition.
- // So, we detect a reentrant call here and throw an error.
- // This is documented in nsIPrivateBrowsingService.idl.
- if (this._currentStatus != STATE_IDLE)
- throw Cr.NS_ERROR_FAILURE;
-
- if (val == this._inPrivateBrowsing)
- return;
-
- try {
- if (val) {
- if (!this._canEnterPrivateBrowsingMode())
- return;
- }
- else {
- if (!this._canLeavePrivateBrowsingMode())
- return;
- }
-
- this._ensureCanCloseWindows();
-
- // start the transition now that we know that we can
- this._currentStatus = STATE_TRANSITION_STARTED;
-
- this._autoStarted = this._prefs.getBoolPref("browser.privatebrowsing.autostart");
- this._inPrivateBrowsing = val != false;
-
- this._recordTransitionTime("started");
-
- let data = val ? "enter" : "exit";
-
- let quitting = Cc["@mozilla.org/supports-PRBool;1"].
- createInstance(Ci.nsISupportsPRBool);
- quitting.data = this._quitting;
-
- // notify observers of the pending private browsing mode change
- this._obs.notifyObservers(quitting, "private-browsing-change-granted", data);
-
- // destroy the current session and start initial cleanup
- this._onBeforePrivateBrowsingModeChange();
-
- this._obs.notifyObservers(quitting, "private-browsing", data);
-
- this._recordTransitionTime("prepared");
-
- // load the appropriate session
- this._onAfterPrivateBrowsingModeChange();
- } catch (ex) {
- // We aborted the transition to/from private browsing, we must restore the
- // beforeunload handling on all the windows for which we switched it off.
- for (let i = 0; i < this._windowsToClose.length; i++)
- this._windowsToClose[i].docShell.contentViewer.resetCloseWindow();
- // We don't log an error when the transition is canceled from beforeunload
- if (ex != Cr.NS_ERROR_ABORT)
- Cu.reportError("Exception thrown while processing the " +
- "private browsing mode change request: " + ex.toString());
- } finally {
- this._windowsToClose = [];
- this._notifyIfTransitionComplete();
- this._lastChangedByCommandLine = false;
- }
- },
-
- /**
- * Whether private browsing has been started automatically.
- */
- get autoStarted() {
- return this._inPrivateBrowsing && this._autoStarted;
- },
-
- /**
- * Whether the latest transition was initiated from the command line.
- */
- get lastChangedByCommandLine() {
- return this._lastChangedByCommandLine;
- }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PrivateBrowsingService]);
diff --git a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.manifest b/browser/components/privatebrowsing/src/nsPrivateBrowsingService.manifest
deleted file mode 100644
index 2b1d3394a2f8..000000000000
--- a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.manifest
+++ /dev/null
@@ -1,17 +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 {c31f4883-839b-45f6-82ad-a6a9bc5ad599} nsPrivateBrowsingService.js
-contract @mozilla.org/privatebrowsing;1 {c31f4883-839b-45f6-82ad-a6a9bc5ad599}
-category command-line-handler m-privatebrowsing @mozilla.org/privatebrowsing;1
-category app-startup nsPrivateBrowsingService service,@mozilla.org/privatebrowsing;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
diff --git a/browser/components/privatebrowsing/src/nsPrivateBrowsingServiceWrapper.cpp b/browser/components/privatebrowsing/src/nsPrivateBrowsingServiceWrapper.cpp
deleted file mode 100644
index fe2bcaa8a043..000000000000
--- a/browser/components/privatebrowsing/src/nsPrivateBrowsingServiceWrapper.cpp
+++ /dev/null
@@ -1,93 +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 "nsPrivateBrowsingServiceWrapper.h"
-#include "nsServiceManagerUtils.h"
-#include "jsapi.h"
-#include "nsIJSContextStack.h"
-
-class JSStackGuard
-{
-public:
- JSStackGuard();
- ~JSStackGuard();
-
-private:
- nsCOMPtr
-
-
diff --git a/browser/components/privatebrowsing/test/browser/global/head.js b/browser/components/privatebrowsing/test/browser/global/head.js
deleted file mode 100644
index 73257a5e3ba6..000000000000
--- a/browser/components/privatebrowsing/test/browser/global/head.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Make sure that we clean up after each test if it times out, for example.
-registerCleanupFunction(function() {
- var pb = Cc["@mozilla.org/privatebrowsing;1"].
- getService(Ci.nsIPrivateBrowsingService);
- ok(!pb.privateBrowsingEnabled, "Private browsing should be terminated after finishing the test");
- pb.privateBrowsingEnabled = false;
- try {
- Services.prefs.clearUserPref("browser.privatebrowsing.keep_current_session");
- } catch(e) {}
-});
-
-/**
- * Waits for completion of a clear history operation, before
- * proceeding with aCallback.
- *
- * @param aCallback
- * Function to be called when done.
- */
-function waitForClearHistory(aCallback) {
- Services.obs.addObserver(function observeCH(aSubject, aTopic, aData) {
- Services.obs.removeObserver(observeCH, PlacesUtils.TOPIC_EXPIRATION_FINISHED);
- aCallback();
- }, PlacesUtils.TOPIC_EXPIRATION_FINISHED, false);
- PlacesUtils.bhistory.removeAllPages();
-}
-
-/*
- * Function created to put a window in PB mode.
- * THIS IS DANGEROUS. DO NOT DO THIS OUTSIDE OF TESTS!
- */
-function setPrivateWindow(aWindow, aEnable) {
- return aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIWebNavigation)
- .QueryInterface(Ci.nsIDocShellTreeItem)
- .treeOwner
- .QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIXULWindow)
- .docShell.QueryInterface(Ci.nsILoadContext)
- .usePrivateBrowsing = aEnable;
-}
diff --git a/browser/components/privatebrowsing/test/browser/global/popup.html b/browser/components/privatebrowsing/test/browser/global/popup.html
deleted file mode 100644
index 333a303469ee..000000000000
--- a/browser/components/privatebrowsing/test/browser/global/popup.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-