Backed out 2 changesets (bug 1654817) on request by aklotz

Backed out changeset bf721cd8ab14 (bug 1654817)
Backed out changeset fb1c314e6394 (bug 1654817)

mobile/android/app/geckoview-prefs.js

@@ -19,13 +19,7 @@ pref("privacy.trackingprotection.pbmode.enabled", false);
 
 pref("browser.tabs.remote.autostart", true);
 pref("dom.ipc.keepProcessesAlive.web", 1);
-
-#ifdef RELEASE_OR_BETA
-  pref("dom.ipc.processCount", 1);
-#else
-  pref("dom.ipc.processCount", 3);
-#endif
-
+pref("dom.ipc.processCount", 1);
 pref("dom.ipc.processPrelaunch.enabled", false);
 
 // Don't create the hidden window during startup.

taskcluster/ci/test/misc.yml

@@ -8,7 +8,7 @@ job-defaults:
 geckoview-junit:
     description: "Geckoview junit run"
     suite: geckoview-junit
-    variants: ["geckoview-e10s-single", "geckoview-fission"]
+    variants: ["geckoview-e10s-multi", "geckoview-fission"]
     treeherder-symbol: gv-junit
     loopback-video: true
     e10s: true

taskcluster/taskgraph/transforms/tests.py

@@ -162,7 +162,7 @@ def runs_on_central(task):
     return match_run_on_projects("mozilla-central", task["run-on-projects"])
 
 
-def gv_e10s_filter(task):
+def gv_e10s_multi_filter(task):
     return get_mobile_project(task) == "geckoview" and task["e10s"]
 
 
@@ -175,24 +175,24 @@ def fission_filter(task):
 
 
 TEST_VARIANTS = {
-    "geckoview-e10s-single": {
-        "description": "{description} with single-process e10s",
-        "filterfn": gv_e10s_filter,
+    "geckoview-e10s-multi": {
+        "description": "{description} with e10s-multi enabled",
+        "filterfn": gv_e10s_multi_filter,
         "replace": {
             "run-on-projects": ["trunk"],
         },
-        "suffix": "e10s-single",
+        "suffix": "e10s-multi",
         "merge": {
             "mozharness": {
                 "extra-options": [
-                    "--setpref=dom.ipc.processCount=1",
+                    "--setpref=dom.ipc.processCount=3",
                 ],
             },
         },
     },
     "geckoview-fission": {
         "description": "{description} with fission enabled",
-        "filterfn": gv_e10s_filter,
+        "filterfn": gv_e10s_multi_filter,
         "suffix": "fis",
         "merge": {
             # Ensures the default state is to not run anywhere.