Bug 1271911 - Enable the browser.tabs.remote.force-enable preference when using e10s. r?maja_zf draft
authorDave Hunt <dhunt@mozilla.com>
Fri, 03 Jun 2016 11:02:47 +0100
changeset 375055 344f8fa299c63420f333b3f121b84c0cf1059d24
parent 375054 e27fe24a746fa839f1cabe198faf1bad42c7dc4b
child 375056 94bd10920434ad0ddde2ebb5c859dd20fe37e169
push id20149
push userdhunt@mozilla.com
push dateFri, 03 Jun 2016 10:07:55 +0000
reviewersmaja_zf
bugs1271911
milestone49.0a1
Bug 1271911 - Enable the browser.tabs.remote.force-enable preference when using e10s. r?maja_zf MozReview-Commit-ID: BWqRrhPx7h8
testing/marionette/harness/marionette/runner/base.py
testing/marionette/harness/session/runner/base.py
--- a/testing/marionette/harness/marionette/runner/base.py
+++ b/testing/marionette/harness/marionette/runner/base.py
@@ -432,16 +432,17 @@ class BaseMarionetteArguments(ArgumentPa
             args.app_args.append('-jsdebugger')
             args.socket_timeout = None
 
         args.prefs = self._get_preferences(args.prefs_files, args.prefs_args)
 
         if args.e10s:
             args.prefs.update({
                 'browser.tabs.remote.autostart': True,
+                'browser.tabs.remote.force-enable': True,
                 'extensions.e10sBlocksEnabling': False
             })
 
         for container in self.argument_containers:
             if hasattr(container, 'verify_usage_handler'):
                 container.verify_usage_handler(args)
 
         return args
--- a/testing/marionette/harness/session/runner/base.py
+++ b/testing/marionette/harness/session/runner/base.py
@@ -401,16 +401,17 @@ class BaseSessionArguments(ArgumentParse
             args.app_args.append('-jsdebugger')
             args.socket_timeout = None
 
         args.prefs = self._get_preferences(args.prefs_files, args.prefs_args)
 
         if args.e10s:
             args.prefs.update({
                 'browser.tabs.remote.autostart': True,
+                'browser.tabs.remote.force-enable': True,
                 'extensions.e10sBlocksEnabling': False
             })
 
         for container in self.argument_containers:
             if hasattr(container, 'verify_usage_handler'):
                 container.verify_usage_handler(args)
 
         return args