Bug 1411797 - Turn off Activity Stream for 57
MozReview-Commit-ID: B72l68DXRy9
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1259,17 +1259,17 @@ pref("browser.newtabpage.rows", 3);
// number of columns of newtab grid
pref("browser.newtabpage.columns", 5);
// directory tiles download URL
pref("browser.newtabpage.directory.source", "https://tiles.services.mozilla.com/v3/links/fetch/%LOCALE%/%CHANNEL%");
// activates Activity Stream
-pref("browser.newtabpage.activity-stream.enabled", true);
+pref("browser.newtabpage.activity-stream.enabled", false);
pref("browser.newtabpage.activity-stream.prerender", true);
pref("browser.newtabpage.activity-stream.aboutHome.enabled", true);
pref("browser.library.activity-stream.enabled", true);
// Enable the DOM fullscreen API.
pref("full-screen-api.enabled", true);
--- a/browser/base/content/test/about/browser.ini
+++ b/browser/base/content/test/about/browser.ini
@@ -9,16 +9,17 @@ support-files =
searchSuggestionEngine.xml
test_bug959531.html
POSTSearchEngine.xml
[browser_aboutCertError.js]
[browser_aboutHealthReport.js]
skip-if = os == "linux" # Bug 924307
[browser_aboutHome_imitate.js]
+skip-if = os == "win" && debug && !e10s # Bug 1411797
[browser_aboutHome_input.js]
skip-if = os == "win" && debug && !e10s # Bug 1399648
[browser_aboutHome_search_POST.js]
[browser_aboutHome_search_composing.js]
skip-if = !debug && (os == "mac" || (os == "linux" && bits == 32)) # Bug 1400491, bug 1399648
[browser_aboutHome_search_searchbar.js]
[browser_aboutHome_search_suggestion.js]
skip-if = os == "mac" || (os == "linux" && !debug) # Bug 1399648
--- a/browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js
+++ b/browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js
@@ -25,17 +25,17 @@ function cleanup() {
aboutNewTabService.resetNewTabURL();
}
do_register_cleanup(cleanup);
add_task(async function test_as_and_prerender_initialized() {
Assert.equal(aboutNewTabService.activityStreamEnabled, Services.prefs.getBoolPref(ACTIVITY_STREAM_PREF),
".activityStreamEnabled should be set to the correct initial value");
- Assert.equal(aboutNewTabService.activityStreamPrerender, Services.prefs.getBoolPref(ACTIVITY_STREAM_PRERENDER_PREF),
+ Assert.equal(aboutNewTabService.activityStreamPrerender, Services.prefs.getBoolPref(ACTIVITY_STREAM_PREF),
".activityStreamPrerender should be set to the correct initial value");
Services.prefs.getBoolPref(ACTIVITY_STREAM_PREF);
});
/**
* Test the overriding of the default URL
*/
add_task(async function test_override_activity_stream_disabled() {
--- a/browser/components/search/test/browser_searchEngine_behaviors.js
+++ b/browser/components/search/test/browser_searchEngine_behaviors.js
@@ -100,18 +100,18 @@ function promiseStateChangeURI() {
}
gBrowser.addProgressListener(listener);
});
}
function promiseContentSearchReady(browser) {
return ContentTask.spawn(browser, {}, async function(args) {
- await ContentTaskUtils.waitForCondition(() => content.wrappedJSObject.gContentSearchController &&
- content.wrappedJSObject.gContentSearchController.defaultEngine
+ await ContentTaskUtils.waitForCondition(() => (content.wrappedJSObject.gContentSearchController ||
+ (content.wrappedJSObject.gSearch || {})._contentSearchController || {}).defaultEngine
);
});
}
add_task(async function() {
await SpecialPowers.pushPrefEnv({ set: [
["browser.search.widget.inNavBar", true],
]});
--- a/browser/extensions/screenshots/test/browser/browser.ini
+++ b/browser/extensions/screenshots/test/browser/browser.ini
@@ -1,5 +1,6 @@
[DEFAULT]
support-files =
head.js
[browser_screenshots_ui_check.js]
+skip-if = os == "win" && bits == 64 && debug # Bug 1411797
--- a/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js
@@ -35,16 +35,17 @@ add_task(async function setup() {
// Make sure to restore the engine once we're done.
registerCleanupFunction(async function() {
Services.search.currentEngine = originalEngine;
Services.search.removeEngine(engineDefault);
Services.search.removeEngine(engineOneOff);
await PlacesTestUtils.clearHistory();
Services.telemetry.setEventRecordingEnabled("navigation", false);
+ Services.prefs.clearUserPref("browser.newtabpage.activity-stream.enabled");
Services.prefs.clearUserPref("browser.newtabpage.activity-stream.aboutHome.enabled");
});
});
add_task(async function test_abouthome_simpleQuery() {
// Make sure Activity Stream about:home is disabled.
Services.prefs.setBoolPref("browser.newtabpage.activity-stream.aboutHome.enabled", false);
@@ -93,16 +94,17 @@ add_task(async function test_abouthome_s
events = (events.parent || []).filter(e => e[1] == "navigation" && e[2] == "search");
checkEvents(events, [["navigation", "search", "about_home", "enter", {engine: "other-MozSearch"}]]);
await BrowserTestUtils.removeTab(tab);
});
add_task(async function test_abouthome_activitystream_simpleQuery() {
// Make sure Activity Stream about:home is enabled.
+ Services.prefs.setBoolPref("browser.newtabpage.activity-stream.enabled", true);
Services.prefs.setBoolPref("browser.newtabpage.activity-stream.aboutHome.enabled", true);
// Let's reset the counts.
Services.telemetry.clearScalars();
Services.telemetry.clearEvents();
let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS");
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
--- a/dom/indexedDB/test/browser.ini
+++ b/dom/indexedDB/test/browser.ini
@@ -12,10 +12,11 @@ support-files =
browser_permissionsWorker.js
bug839193.js
bug839193.xul
[browser_forgetThisSite.js]
[browser_permissionsPromptAllow.js]
[browser_permissionsPromptDeny.js]
[browser_permissionsPromptWorker.js]
+skip-if = os == "win" && debug && e10s # Bug 1411797
[browser_perwindow_privateBrowsing.js]
[browser_bug839193.js]