Bug 1175606 - Enable Tracking Protection by default in Private Browsing Mode;r=ttaubert

This commit is contained in:
Panos Astithas 2015-08-08 00:33:05 +01:00
parent a8aafcef7e
commit 61d6a04a99
4 changed files with 2 additions and 17 deletions

View File

@ -60,18 +60,6 @@ document.addEventListener("DOMContentLoaded", function () {
// Update state that depends on preferences. // Update state that depends on preferences.
prefObserver.observe(); prefObserver.observe();
// This check can be removed when Tracking Protection is always available.
let tpUIEnabled = false;
try {
tpUIEnabled = Services.prefs.getBoolPref("privacy.trackingprotection.ui.enabled");
} catch (ex) {
// The preference is not available.
}
if (!tpUIEnabled) {
document.getElementById("trackingProtectionSection")
.setAttribute("hidden", "true");
}
}, false); }, false);
function openPrivateWindow() { function openPrivateWindow() {

View File

@ -17,6 +17,7 @@ support-files =
[browser_privatebrowsing_DownloadLastDirWithCPS.js] [browser_privatebrowsing_DownloadLastDirWithCPS.js]
[browser_privatebrowsing_about.js] [browser_privatebrowsing_about.js]
tags = trackingprotection
[browser_privatebrowsing_aboutHomeButtonAfterWindowClose.js] [browser_privatebrowsing_aboutHomeButtonAfterWindowClose.js]
[browser_privatebrowsing_aboutSessionRestore.js] [browser_privatebrowsing_aboutSessionRestore.js]
[browser_privatebrowsing_cache.js] [browser_privatebrowsing_cache.js]

View File

@ -46,14 +46,12 @@ function* testLinkOpensUrl({ win, tab, elementId, expectedUrl }) {
*/ */
add_task(function* test_links() { add_task(function* test_links() {
// Use full version and change the remote URLs to prevent network access. // Use full version and change the remote URLs to prevent network access.
Services.prefs.setBoolPref("privacy.trackingprotection.ui.enabled", true);
Services.prefs.setCharPref("app.support.baseURL", "https://example.com/"); Services.prefs.setCharPref("app.support.baseURL", "https://example.com/");
Services.prefs.setCharPref("privacy.trackingprotection.introURL", Services.prefs.setCharPref("privacy.trackingprotection.introURL",
"https://example.com/tour"); "https://example.com/tour");
registerCleanupFunction(function () { registerCleanupFunction(function () {
Services.prefs.clearUserPref("privacy.trackingprotection.introURL"); Services.prefs.clearUserPref("privacy.trackingprotection.introURL");
Services.prefs.clearUserPref("app.support.baseURL"); Services.prefs.clearUserPref("app.support.baseURL");
Services.prefs.clearUserPref("privacy.trackingprotection.ui.enabled");
}); });
let { win, tab } = yield openAboutPrivateBrowsing(); let { win, tab } = yield openAboutPrivateBrowsing();
@ -77,12 +75,10 @@ add_task(function* test_links() {
*/ */
add_task(function* test_toggleTrackingProtection() { add_task(function* test_toggleTrackingProtection() {
// Use tour version but disable Tracking Protection. // Use tour version but disable Tracking Protection.
Services.prefs.setBoolPref("privacy.trackingprotection.ui.enabled", true);
Services.prefs.setBoolPref("privacy.trackingprotection.pbmode.enabled", Services.prefs.setBoolPref("privacy.trackingprotection.pbmode.enabled",
true); true);
registerCleanupFunction(function () { registerCleanupFunction(function () {
Services.prefs.clearUserPref("privacy.trackingprotection.pbmode.enabled"); Services.prefs.clearUserPref("privacy.trackingprotection.pbmode.enabled");
Services.prefs.clearUserPref("privacy.trackingprotection.ui.enabled");
}); });
let { win, tab } = yield openAboutPrivateBrowsing(); let { win, tab } = yield openAboutPrivateBrowsing();

View File

@ -1087,7 +1087,7 @@ pref("privacy.donottrackheader.enabled", false);
// Enforce tracking protection in all modes // Enforce tracking protection in all modes
pref("privacy.trackingprotection.enabled", false); pref("privacy.trackingprotection.enabled", false);
// Enforce tracking protection in Private Browsing mode // Enforce tracking protection in Private Browsing mode
pref("privacy.trackingprotection.pbmode.enabled", false); pref("privacy.trackingprotection.pbmode.enabled", true);
pref("dom.event.contextmenu.enabled", true); pref("dom.event.contextmenu.enabled", true);
pref("dom.event.clipboardevents.enabled", true); pref("dom.event.clipboardevents.enabled", true);