Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-07 11:56:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset f6a62807987d (bug 1175606) for mass talos bustage CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2015-08-07 14:29:36 -07:00
parent 1582c88593
commit cca4799244
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/components/privatebrowsing/test/browser/browser.ini
View File

@ -17,7 +17,6 @@ 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]

4
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js
View File

@ -46,12 +46,14 @@ 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();
@ -75,10 +77,12 @@ 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();

2
modules/libpref/init/all.js
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", true); pref("privacy.trackingprotection.pbmode.enabled", false);
pref("dom.event.contextmenu.enabled", true); pref("dom.event.contextmenu.enabled", true);
pref("dom.event.clipboardevents.enabled", true); pref("dom.event.clipboardevents.enabled", true);