mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 11:55:49 +00:00
Backed out 2 changesets (bug 1549855) for failing Android mochitests on robocop_text_page.html CLOSED TREE
Backed out changeset 928038c23227 (bug 1549855) Backed out changeset 9383ea5938fe (bug 1549855)
This commit is contained in:
parent
f589fd6d1b
commit
90e3810429
@ -15,7 +15,8 @@ function setE10sPrefs() {
|
||||
return new Promise(resolve =>
|
||||
SpecialPowers.pushPrefEnv({
|
||||
set: [
|
||||
["browser.tabs.remote.autostart", true]
|
||||
["browser.tabs.remote.autostart", true],
|
||||
["browser.tabs.remote.force-enable", true]
|
||||
]
|
||||
}, resolve));
|
||||
}
|
||||
|
@ -3619,7 +3619,7 @@ Tab.prototype = {
|
||||
this.browser.setAttribute("type", "content");
|
||||
this.browser.setAttribute("messagemanagergroup", "browsers");
|
||||
|
||||
if (Preferences.get("browser.tabs.remote.autostart", false)) {
|
||||
if (Preferences.get("browser.tabs.remote.force-enable", false)) {
|
||||
this.browser.setAttribute("remote", "true");
|
||||
}
|
||||
|
||||
|
@ -571,6 +571,7 @@ class BaseMarionetteTestRunner(object):
|
||||
if self.e10s:
|
||||
self.prefs.update({
|
||||
'browser.tabs.remote.autostart': True,
|
||||
'browser.tabs.remote.force-enable': True,
|
||||
})
|
||||
|
||||
# If no repeat has been set, default to 30 extra runs
|
||||
|
@ -458,6 +458,7 @@ def test_option_e10s_sets_prefs(mach_parsed_kwargs, e10s):
|
||||
runner = MarionetteTestRunner(**mach_parsed_kwargs)
|
||||
e10s_prefs = {
|
||||
'browser.tabs.remote.autostart': True,
|
||||
'browser.tabs.remote.force-enable': True,
|
||||
}
|
||||
for k,v in e10s_prefs.iteritems():
|
||||
assert runner.prefs.get(k, False) == (v and e10s)
|
||||
|
@ -2,7 +2,9 @@
|
||||
|
||||
/* globals ExtensionTestUtils */
|
||||
|
||||
// xpcshell disables e10s by default. Turn it on.
|
||||
Services.prefs.setBoolPref("browser.tabs.remote.autostart", true);
|
||||
// We want to force enable e10s so we can test remote extensions
|
||||
Services.prefs.setBoolPref("browser.tabs.remote.force-enable", true);
|
||||
// This causes nsIXULRuntime.browserTabsRemoteAutostart to reset and force e10s
|
||||
Services.prefs.setStringPref("e10s.rollout.cohort", "xpcshell-test");
|
||||
|
||||
ExtensionTestUtils.remoteContentScripts = true;
|
||||
|
Loading…
Reference in New Issue
Block a user