Bug 1271911 - Enable the browser.tabs.remote.force-enable preference when using e10s. r=maja_zf
authorDave Hunt <dhunt@mozilla.com>
Fri, 03 Jun 2016 11:02:47 +0100
changeset 375204 e845e5efd23040e5afd4d43ae6b25439ad96fbd4
parent 375203 0f0586c0b68d927512617266a133545272dba9c7
child 375205 465fe1502bf49a376d9237bd1438d8a729adb770
push id20189
push userjlund@mozilla.com
push dateFri, 03 Jun 2016 17:40: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