mozilla-central: changeset 275543:5b034080510801588fa0fe9455022172a26d990e

author	Jim Mathies <jmathies@mozilla.com>
	Thu, 03 Dec 2015 17:39:05 -0800
changeset 275543	5b034080510801588fa0fe9455022172a26d990e
parent 275542	aea828e2cdf767a358ebc6ea661dd3b9b4160321
child 275544	badf9e19d881a54c7aa577414c4b9fb067de96b2
push id	29758
push user	cbook@mozilla.com
push date	Fri, 04 Dec 2015 10:56:41 +0000
treeherder	mozilla-central@a36cc9262f70 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	felipe
bugs	1227515
milestone	45.0a1
first release with	nightly linux32 e02b17a2b5b8 / 45.0a1 / 20151204030208 / files nightly linux64 e02b17a2b5b8 / 45.0a1 / 20151204030208 / files nightly mac e02b17a2b5b8 / 45.0a1 / 20151204030208 / files nightly win32 e02b17a2b5b8 / 45.0a1 / 20151204030208 / files nightly win64 e02b17a2b5b8 / 45.0a1 / 20151204030208 / files
last release without	nightly linux32 85cf2e720a84 / 45.0a1 / 20151203053521 / files nightly linux64 85cf2e720a84 / 45.0a1 / 20151203053521 / files nightly mac 85cf2e720a84 / 45.0a1 / 20151203053521 / files nightly win32 85cf2e720a84 / 45.0a1 / 20151203053521 / files nightly win64 85cf2e720a84 / 45.0a1 / 20151203053521 / files

--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -303,16 +303,17 @@ user_pref("media.eme.enabled", true);
 
 user_pref("media.autoplay.enabled", true);
 
 #if defined(XP_WIN)
 user_pref("media.decoder.heuristic.dormant.timeout", 0);
 #endif
 
 // Don't prompt about e10s
+user_pref("browser.displayedE10SNotice", 5);
 user_pref("browser.displayedE10SPrompt.1", 5);
 // Don't use auto-enabled e10s
 user_pref("browser.tabs.remote.autostart.1", false);
 user_pref("browser.tabs.remote.autostart.2", false);
 // Don't forceably kill content processes after a timeout
 user_pref("dom.ipc.tabs.shutdownTimeoutSecs", 0);
 
 // Avoid performing Reader Mode intros during tests.