Bug 1410206 - Remove non-e10s support from talos; r=jmaher

MozReview-Commit-ID: 2iCM35XAXJM

--HG--
extra : rebase_source : 831728acfff84ee49297f906a20dad98ca054ca5

testing/talos/talos/cmdline.py

@@ -70,9 +70,6 @@ def create_parser(mach_interface=False):
             help="Suite to use (instead of --activeTests)")
     add_arg('--subtests',
             help="Name of the subtest(s) to run (works only on DAMP)")
-    add_arg('--disable-e10s', dest='e10s',
-            action='store_false', default=True,
-            help="disable e10s")
     add_arg('--noChrome', action='store_true',
             help="do not run tests as chrome")
     add_arg('--mainthread', action='store_true',

testing/talos/talos/config.py

@@ -30,7 +30,6 @@ DEFAULTS = dict(
         cycles=1,
         profile_path='${talos}/base_profile',
         responsiveness=False,
-        e10s=False,
         gecko_profile=False,
         gecko_profile_interval=1,
         gecko_profile_entries=100000,
@@ -47,7 +46,6 @@ DEFAULTS = dict(
         userready=False,
         testeventmap=[],
         base_vs_ref=False,
-        tpdisable_e10s=False,
         tpnoisy=True,
         tppagecycles=1,
         tploadnocache=False,
@@ -290,12 +288,7 @@ def set_webserver(config):
 
 @validator
 def update_prefs(config):
-    # if e10s is enabled, set prefs accordingly
-    if config['e10s']:
-        config['preferences']['browser.tabs.remote.autostart'] = True
-    else:
-        config['preferences']['browser.tabs.remote.autostart'] = False
-
+    config['preferences']['browser.tabs.remote.autostart'] = True
     # update prefs from command line
     prefs = config.pop('extraPrefs')
     if prefs:
@@ -438,7 +431,6 @@ def get_browser_config(config):
                 'branch_name': '',
                 'child_process': 'plugin-container',
                 'develop': False,
-                'e10s': False,
                 'process': '',
                 'framework': 'talos',
                 'repository': None,

testing/talos/talos/pageloader/chrome/pageloader.js

@@ -46,8 +46,6 @@ var gPaintWindow = window;
 var gPaintListener = false;
 var loadNoCache = false;
 var scrollTest = false;
-var gDisableE10S = false;
-var gUseE10S = false;
 var profilingInfo = false;
 var baseVsRef = false;
 
@@ -154,7 +152,6 @@ function plInit() {
     if (args.fnbpaint) useFNBPaint = true;
     if (args.loadnocache) loadNoCache = true;
     if (args.scrolltest) scrollTest = true;
-    if (args.disableE10S) gDisableE10S = true;
     if (args.profilinginfo) profilingInfo = JSON.parse(args.profilinginfo)
 
     if (profilingInfo) {
@@ -234,8 +231,8 @@ function plInit() {
       // able to resize the window and not have it get clobbered
       // by the persisted values
       setTimeout(function() {
-        // For e10s windows, since bug 1261842, the initial browser is remote unless
-        // it attempts to browse to a URI that should be non-remote (landed at bug 1047603).
+        // Since bug 1261842, the initial browser is remote unless it attempts
+        // to browse to a URI that should be non-remote (landed at bug 1047603).
         //
         // However, when it loads a URI that requires a different remote type,
         // we lose the load listener and the injected tpRecordTime.remote,
@@ -244,13 +241,11 @@ function plInit() {
         // instance which adds the load listener and injects tpRecordTime), all the
         // pages should be able to load in the same mode as the initial page - due
         // to this reinitialization on the switch.
-        if (browserWindow.gMultiProcessBrowser) {
-          let remoteType = E10SUtils.getRemoteTypeForURI(pageUrls[0], true);
-          if (remoteType) {
-            browserWindow.XULBrowserWindow.forceInitialBrowserRemote(remoteType);
-          } else {
-            browserWindow.XULBrowserWindow.forceInitialBrowserNonRemote(null);
-          }
+        let remoteType = E10SUtils.getRemoteTypeForURI(pageUrls[0], true);
+        if (remoteType) {
+          browserWindow.XULBrowserWindow.forceInitialBrowserRemote(remoteType);
+        } else {
+          browserWindow.XULBrowserWindow.forceInitialBrowserNonRemote(null);
         }
 
         browserWindow.resizeTo(winWidth, winHeight);
@@ -258,9 +253,6 @@ function plInit() {
         browserWindow.focus();
 
         content = browserWindow.getBrowser();
-        gUseE10S = !gDisableE10S || (plPageFlags() & EXECUTE_SCROLL_TEST) ||
-                    (content.selectedBrowser &&
-                    content.selectedBrowser.getAttribute("remote") == "true")
 
         // Load the frame script for e10s / IPC message support
         let contentScript = "data:,function _contentLoadHandler(e) { " +
@@ -495,11 +487,8 @@ var plNextPage = async function() {
       var tccend = new Date();
       report.recordCCTime(tccend - tccstart);
 
-      // Now asynchronously trigger GC / CC in the content process if we're
-      // in an e10s window.
-      if (browserWindow.gMultiProcessBrowser) {
-        await forceContentGC();
-      }
+      // Now asynchronously trigger GC / CC in the content process
+      await forceContentGC();
     }
 
     setTimeout(plLoadPage, delay);
@@ -727,7 +716,7 @@ function _loadHandler(fnbpaint = 0) {
   plNextPage();
 }
 
-// the core handler for remote (e10s) browser
+// the core handler
 function plLoadHandlerMessage(message) {
   let fnbpaint = 0;
   if (message.json.fnbpaint !== undefined) {
@@ -764,7 +753,7 @@ function plLoadHandlerMessage(message) {
   }
 }
 
-// the record time handler used for remote (e10s) browser
+// the record time handler
 function plRecordTimeMessage(message) {
   gTime = message.json.time;
   gStartTime = message.json.startTime;

testing/talos/talos/pageloader/components/tp-cmdline.js

@@ -100,7 +100,6 @@ PageLoaderCmdLineHandler.prototype =
       args.fnbpaint = cmdLine.handleFlag("fnbpaint", false);
       args.loadnocache = cmdLine.handleFlag("tploadnocache", false);
       args.scrolltest = cmdLine.handleFlag("tpscrolltest", false);
-      args.disableE10s = cmdLine.handleFlag("tpdisable_e10s", false);
     } catch (e) {
       return;
     }
@@ -134,8 +133,7 @@ PageLoaderCmdLineHandler.prototype =
   "  -tpnoforcecc           Don't force cycle collection between each pageload\n" +
   "  -tpmozafterpaint       Measure Time after recieving MozAfterPaint event instead of load event\n" +
   "  -fnbpaint  Measure time after a first non-blank paint has occurred\n" +
-  "  -tpscrolltest          Unknown\n" +
-  "  -tpdisable_e10s        disable pageloader e10s code path\n"
+  "  -tpscrolltest          Unknown\n"
 };
 
 

testing/talos/talos/pageloader/install.rdf

@@ -4,7 +4,7 @@
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>pageloader@mozilla.org</em:id>
-    <em:version>1.0.29</em:version>
+    <em:version>1.0.30</em:version>
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>

testing/talos/talos/run_tests.py

@@ -59,9 +59,8 @@ def buildCommandLine(test):
 
     # build pageloader command from options
     url = ['-tp', test['tpmanifest']]
-    CLI_bool_options = ['tpchrome', 'tpmozafterpaint', 'tpdisable_e10s',
-                        'tpnoisy', 'tprender', 'tploadnocache',
-                        'tpscrolltest', 'fnbpaint']
+    CLI_bool_options = ['tpchrome', 'tpmozafterpaint', 'tpnoisy', 'tprender',
+                        'tploadnocache', 'tpscrolltest', 'fnbpaint']
     CLI_options = ['tpcycles', 'tppagecycles', 'tpdelay', 'tptimeout']
     for key in CLI_bool_options:
         if test.get(key):
@@ -191,9 +190,8 @@ def run_tests(config, browser_config):
     httpd = setup_webserver(browser_config['webserver'])
     httpd.start()
 
-    # if e10s add as extra results option
-    if config['e10s']:
-        talos_results.add_extra_option('e10s')
+    # legacy still required for perfherder data
+    talos_results.add_extra_option('e10s')
 
     # stylo is another option for testing
     if config['enable_stylo']:

testing/talos/talos/test.py

@@ -720,7 +720,6 @@ class dromaeo_dom(dromaeo):
     gecko_profile_interval = 2
     gecko_profile_entries = 10000000
     tpmanifest = '${talos}/tests/dromaeo/dom.manifest'
-    tpdisable_e10s = True
     unit = 'score'