Bug 1196094 - use e10s when doing PGO profiling, r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D32329

--HG--
extra : moz-landing-system : lando

build/pgo/profileserver.py

@@ -63,13 +63,18 @@ if __name__ == '__main__':
         for path in prefpaths:
             prefs.update(Preferences.read_prefs(path))
 
-        interpolation = {"server": "%s:%d" % httpd.httpd.server_address,
-                         "OOP": "false"}
+        interpolation = {"server": "%s:%d" % httpd.httpd.server_address}
         for k, v in prefs.items():
             if isinstance(v, string_types):
                 v = v.format(**interpolation)
             prefs[k] = Preferences.cast(v)
 
+        # Enforce e10s. This isn't in one of the user.js files because those
+        # are shared with android, which doesn't want this on. We can't
+        # interpolate because the formatting code only works for strings,
+        # and this is a bool pref.
+        prefs["browser.tabs.remote.autostart"] = True
+
         profile = FirefoxProfile(profile=profilePath,
                                  preferences=prefs,
                                  addons=[os.path.join(
@@ -80,10 +85,9 @@ if __name__ == '__main__':
         env = os.environ.copy()
         env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
         env["XPCOM_DEBUG_BREAK"] = "warn"
-        # TODO should use e10s and gather data from all processes (bug 1196094).
-        # Note that unittest-required/user.js sets the autostart pref, but it
-        # is ignored by the code in nsAppRunner.
-        env["MOZ_FORCE_DISABLE_E10S"] = "1"
+        # We disable sandboxing to make writing profiling data actually work
+        # Bug 1553850 considers fixing this.
+        env["MOZ_DISABLE_CONTENT_SANDBOX"] = "1"
 
         # For VC12+, make sure we can find the right bitness of pgort1x0.dll
         if not substs.get('HAVE_64BIT_BUILD'):

testing/mozharness/scripts/android_emulator_pgo.py

@@ -195,6 +195,12 @@ class AndroidProfileRun(TestingMixin, BaseScript, MozbaseMixin,
                 v = v.format(**interpolation)
             prefs[k] = Preferences.cast(v)
 
+        # Enforce 1proc. This isn't in one of the user.js files because those
+        # are shared with desktop, which wants e10s. We can't interpolate
+        # because the formatting code only works for strings, and this is a
+        # bool pref.
+        prefs["browser.tabs.remote.autostart"] = False
+
         outputdir = self.config.get('output_directory', '/sdcard')
         jarlog = posixpath.join(outputdir, 'en-US.log')
         profdata = posixpath.join(outputdir, 'default.profraw')