diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in index 4f0c3a0d6fd9..96856e573b8a 100644 --- a/browser/components/privatebrowsing/test/browser/Makefile.in +++ b/browser/components/privatebrowsing/test/browser/Makefile.in @@ -58,6 +58,7 @@ _BROWSER_TEST_FILES = \ browser_privatebrowsing_opendir.js \ browser_privatebrowsing_openlocation.js \ browser_privatebrowsing_pageinfo.js \ + browser_privatebrowsing_placestitle.js \ browser_privatebrowsing_popupmode.js \ browser_privatebrowsing_searchbar.js \ browser_privatebrowsing_sslsite_transition.js \ @@ -71,6 +72,7 @@ _BROWSER_TEST_FILES = \ browser_privatebrowsing_zoom.js \ browser_privatebrowsing_zoomrestore.js \ staller.sjs \ + title.sjs \ $(NULL) libs:: $(_BROWSER_TEST_FILES) diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placestitle.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placestitle.js new file mode 100644 index 000000000000..dbb90af47eee --- /dev/null +++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placestitle.js @@ -0,0 +1,125 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Private Browsing Tests. + * + * The Initial Developer of the Original Code is + * Ehsan Akhgari. + * Portions created by the Initial Developer are Copyright (C) 2009 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Ehsan Akhgari (Original Author) + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +// This test makes sure that the title of existing history entries does not +// change inside the private browsing mode. + +function test() { + // initialization + let pb = Cc["@mozilla.org/privatebrowsing;1"]. + getService(Ci.nsIPrivateBrowsingService); + let bhist = Cc["@mozilla.org/browser/global-history;2"]. + getService(Ci.nsIBrowserHistory); + let histsvc = Cc["@mozilla.org/browser/nav-history-service;1"]. + getService(Ci.nsINavHistoryService). + QueryInterface(Ci.nsPIPlacesDatabase); + let cm = Cc["@mozilla.org/cookiemanager;1"]. + getService(Ci.nsICookieManager); + waitForExplicitFinish(); + + const TEST_URL = "http://localhost:8888/browser/browser/components/privatebrowsing/test/browser/title.sjs"; + + function cleanup() { + // delete all history items + bhist.removeAllPages(); + // delete all cookies + cm.removeAll(); + } + cleanup(); + + let observer = { + pass: 1, + onBeginUpdateBatch: function() { + }, + onEndUpdateBatch: function() { + }, + onVisit: function(aURI, aVisitID, aTime, aSessionId, aReferringId, + aTransitionType, _added) { + }, + onTitleChanged: function(aURI, aPageTitle) { + if (aURI.spec != TEST_URL) + return; + switch (this.pass++) { + case 1: // the first time that the page is loaded + is(aPageTitle, "No Cookie", "The page should be loaded without any cookie for the first time"); + gBrowser.selectedTab = gBrowser.addTab(TEST_URL); + break; + case 2: // the second time that the page is loaded + is(aPageTitle, "Cookie", "The page should be loaded with a cookie for the second time"); + cleanup(); + gBrowser.selectedTab = gBrowser.addTab(TEST_URL); + break; + case 3: // before entering the private browsing mode + is(aPageTitle, "No Cookie", "The page should be loaded without any cookie again"); + // enter private browsing mode + pb.privateBrowsingEnabled = true; + gBrowser.selectedTab = gBrowser.addTab(TEST_URL); + executeSoon(function() { + histsvc.removeObserver(observer); + pb.privateBrowsingEnabled = false; + while (gBrowser.browsers.length > 1) + gBrowser.removeCurrentTab(); + cleanup(); + finish(); + }); + break; + default: + ok(false, "Unexpected pass: " + (this.pass - 1)); + } + }, + onBeforeDeleteURI: function(aURI) { + }, + onDeleteURI: function(aURI) { + }, + onClearHistory: function() { + }, + onPageChanged: function(aURI, aWhat, aValue) { + }, + onPageExpired: function(aURI, aVisitTime, aWholeEntry) { + }, + QueryInterface: function(iid) { + if (iid.equals(Ci.nsINavHistoryObserver) || + iid.equals(Ci.nsISupports)) { + return this; + } + throw Cr.NS_ERROR_NO_INTERFACE; + } + }; + histsvc.addObserver(observer, false); + + gBrowser.selectedTab = gBrowser.addTab(TEST_URL); +} diff --git a/browser/components/privatebrowsing/test/browser/title.sjs b/browser/components/privatebrowsing/test/browser/title.sjs new file mode 100644 index 000000000000..c0210b13cb83 --- /dev/null +++ b/browser/components/privatebrowsing/test/browser/title.sjs @@ -0,0 +1,55 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Private Browsing Tests. + * + * The Initial Developer of the Original Code is + * Ehsan Akhgari. + * Portions created by the Initial Developer are Copyright (C) 2009 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Ehsan Akhgari (Original Author) + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +// This provides the tests with a page with different titles based on whether +// a cookie is present or not. + +function handleRequest(request, response) { + response.setStatusLine(request.httpVersion, 200, "OK"); + response.setHeader("Content-Type", "text/html", false); + + var cookie = "name=value"; + var title = "No Cookie"; + if (request.hasHeader("Cookie") && request.getHeader("Cookie") == cookie) + title = "Cookie"; + else + response.setHeader("Set-Cookie", cookie, false); + + response.write(""); + response.write(title); + response.write("test page"); +} diff --git a/browser/components/privatebrowsing/test/unit/do_test_placesTitleNoUpdate.js b/browser/components/privatebrowsing/test/unit/do_test_placesTitleNoUpdate.js new file mode 100644 index 000000000000..6f503c1fce94 --- /dev/null +++ b/browser/components/privatebrowsing/test/unit/do_test_placesTitleNoUpdate.js @@ -0,0 +1,81 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Private Browsing Test Code. + * + * The Initial Developer of the Original Code is + * Ehsan Akhgari . + * Portions created by the Initial Developer are Copyright (C) 2009 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +// Test to make sure that the visited page titles do not get updated inside the +// private browsing mode. + +function do_test() +{ + let pb = Cc[PRIVATEBROWSING_CONTRACT_ID]. + getService(Ci.nsIPrivateBrowsingService); + let histsvc = Cc["@mozilla.org/browser/nav-history-service;1"]. + getService(Ci.nsINavHistoryService); + let bhist = histsvc.QueryInterface(Ci.nsIBrowserHistory); + + const TEST_URI = uri("http://mozilla.com/privatebrowsing"); + const TITLE_1 = "Title 1"; + const TITLE_2 = "Title 2"; + + bhist.removeAllPages(); + + bhist.addPageWithDetails(TEST_URI, TITLE_1, Date.now() * 1000); + do_check_eq(histsvc.getPageTitle(TEST_URI), TITLE_1); + + pb.privateBrowsingEnabled = true; + + bhist.addPageWithDetails(TEST_URI, TITLE_2, Date.now() * 2000); + do_check_eq(histsvc.getPageTitle(TEST_URI), TITLE_1); + + pb.privateBrowsingEnabled = false; + + do_check_eq(histsvc.getPageTitle(TEST_URI), TITLE_1); + + pb.privateBrowsingEnabled = true; + + bhist.setPageTitle(TEST_URI, TITLE_2); + do_check_eq(histsvc.getPageTitle(TEST_URI), TITLE_1); + + pb.privateBrowsingEnabled = false; + + do_check_eq(histsvc.getPageTitle(TEST_URI), TITLE_1); + + bhist.removeAllPages(); +} + +// Support running tests on both the service itself and its wrapper +function run_test() { + run_test_on_all_services(); +} diff --git a/browser/components/privatebrowsing/test/unit/head_privatebrowsing.js b/browser/components/privatebrowsing/test/unit/head_privatebrowsing.js index c579d3609c48..06e39c8c2d2a 100644 --- a/browser/components/privatebrowsing/test/unit/head_privatebrowsing.js +++ b/browser/components/privatebrowsing/test/unit/head_privatebrowsing.js @@ -55,6 +55,12 @@ function LOG(aMsg) { print(aMsg); } +function uri(spec) { + return Cc["@mozilla.org/network/io-service;1"]. + getService(Ci.nsIIOService). + newURI(spec, null, null); +} + // If there's no location registered for the profile direcotry, register one now. var dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties); var profileDir = null; diff --git a/browser/components/privatebrowsing/test/unit/test_placesTitleNoUpdate.js b/browser/components/privatebrowsing/test/unit/test_placesTitleNoUpdate.js new file mode 100644 index 000000000000..9cbb9aa9f026 --- /dev/null +++ b/browser/components/privatebrowsing/test/unit/test_placesTitleNoUpdate.js @@ -0,0 +1,44 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Private Browsing Test Code. + * + * The Initial Developer of the Original Code is + * Ehsan Akhgari . + * Portions created by the Initial Developer are Copyright (C) 2009 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +// Test to make sure that the visited page titles do not get updated inside the +// private browsing mode. + +function run_test() { + PRIVATEBROWSING_CONTRACT_ID = "@mozilla.org/privatebrowsing;1"; + load("do_test_placesTitleNoUpdate.js"); + do_test(); +} diff --git a/browser/components/privatebrowsing/test/unit/test_privatebrowsingwrapper_placesTitleNoUpdate.js b/browser/components/privatebrowsing/test/unit/test_privatebrowsingwrapper_placesTitleNoUpdate.js new file mode 100644 index 000000000000..22413baf35bb --- /dev/null +++ b/browser/components/privatebrowsing/test/unit/test_privatebrowsingwrapper_placesTitleNoUpdate.js @@ -0,0 +1,44 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Private Browsing Test Code. + * + * The Initial Developer of the Original Code is + * Ehsan Akhgari . + * Portions created by the Initial Developer are Copyright (C) 2009 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +// Test to make sure that the visited page titles do not get updated inside the +// private browsing mode. + +function run_test() { + PRIVATEBROWSING_CONTRACT_ID = "@mozilla.org/privatebrowsing-wrapper;1"; + load("do_test_placesTitleNoUpdate.js"); + do_test(); +} diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp index 0775b3fda2b3..b217d89bd5fb 100644 --- a/toolkit/components/places/src/nsNavHistory.cpp +++ b/toolkit/components/places/src/nsNavHistory.cpp @@ -4289,6 +4289,10 @@ nsNavHistory::AddPageWithDetails(nsIURI *aURI, const PRUnichar *aTitle, NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread"); NS_ENSURE_ARG(aURI); + // Don't update the page title inside the private browsing mode. + if (InPrivateBrowsingMode()) + return NS_OK; + PRInt64 visitID; nsresult rv = AddVisit(aURI, aLastVisited, 0, TRANSITION_LINK, PR_FALSE, 0, &visitID); @@ -5254,6 +5258,10 @@ nsNavHistory::SetPageTitle(nsIURI* aURI, NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread"); NS_ENSURE_ARG(aURI); + // Don't update the page title inside the private browsing mode. + if (InPrivateBrowsingMode()) + return NS_OK; + // if aTitle is empty we want to clear the previous title. // We don't want to set it to an empty string, but to a NULL value, // so we use SetIsVoid and SetPageTitleInternal will take care of that @@ -5593,9 +5601,25 @@ nsNavHistory::Observe(nsISupports *aSubject, const char *aTopic, } else if (strcmp(aTopic, NS_PRIVATE_BROWSING_SWITCH_TOPIC) == 0) { if (NS_LITERAL_STRING(NS_PRIVATE_BROWSING_ENTER).Equals(aData)) { +#ifdef LAZY_ADD + // Commit all lazy messages in order to protect against edge cases where a + // lazy message which is not allowed in private browsing mode has been + // added before entering the private browsing mode, and is going to be + // scheduled to be processed after entering the private browsing mode. + CommitLazyMessages(); +#endif + mInPrivateBrowsing = PR_TRUE; } else if (NS_LITERAL_STRING(NS_PRIVATE_BROWSING_LEAVE).Equals(aData)) { +#ifdef LAZY_ADD + // Commit all lazy messages in order to protect against edge cases where a + // lazy message which should be processed in private browsing mode has been + // added before leaving the private browsing mode, and is going to be + // scheduled to be processed after leaving the private browsing mode. + CommitLazyMessages(); +#endif + mInPrivateBrowsing = PR_FALSE; } }