Backed out 3 changesets (bug 1620656) for causing bustage at TestGeck…

…oView. CLOSED TREE Backed out changeset af6b36a497e8 (bug 1620656) Backed out changeset f0b502580ef0 (bug 1620656) Backed out changeset dd0ce5e4a1bf (bug 1620656)
Brli · Jun 16, 2020 · e14bf43 · e14bf43
1 parent ddf574e
commit e14bf43
Show file tree

Hide file tree

Showing 41 changed files with 4,021 additions and 1,410 deletions.
diff --git a/mobile/android/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js
@@ -21,6 +21,8 @@ pref("dom.ipc.keepProcessesAlive.web", 1);
 pref("dom.ipc.processCount", 1);
 pref("dom.ipc.processPrelaunch.enabled", false);
 
+// Tell Telemetry that we're in GeckoView mode.
+pref("toolkit.telemetry.isGeckoViewMode", true);
 // Disable the Telemetry Event Ping
 pref("toolkit.telemetry.eventping.enabled", false);
 // Don't create the hidden window during startup.

diff --git a/mobile/android/components/geckoview/GeckoViewStartup.jsm b/mobile/android/components/geckoview/GeckoViewStartup.jsm
@@ -15,6 +15,8 @@ const { GeckoViewUtils } = ChromeUtils.import(
 XPCOMUtils.defineLazyModuleGetters(this, {
   ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
   EventDispatcher: "resource://gre/modules/Messaging.jsm",
+  GeckoViewTelemetryController:
+    "resource://gre/modules/GeckoViewTelemetryController.jsm",
   Preferences: "resource://gre/modules/Preferences.jsm",
   SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
   Services: "resource://gre/modules/Services.jsm",
@@ -199,6 +201,11 @@ class GeckoViewStartup {
           }
         );
 
+        // This initializes Telemetry for GeckoView only in the parent process.
+        // The Telemetry initialization for the content process is performed in
+        // ContentProcessSingleton.js for consistency with Desktop Telemetry.
+        GeckoViewTelemetryController.setup();
+
         ChromeUtils.import("resource://gre/modules/NotificationDB.jsm");
 
         // Initialize safe browsing module. This is required for content

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -8998,6 +8998,11 @@
   value: 2000
   mirror: always
 
+- name: toolkit.telemetry.isGeckoViewMode
+  type: RelaxedAtomicBool
+  value: false
+  mirror: always
+
 - name: toolkit.telemetry.geckoview.batchDurationMS
   type: RelaxedAtomicUint32
   value: 5000

diff --git a/toolkit/components/build/components.conf b/toolkit/components/build/components.conf
@@ -188,3 +188,13 @@ if MOZ_HAS_TERMINATOR:
             'headers': ['nsTerminator.h'],
         },
     ]
+
+if defined('ENABLE_TESTS'):
+    Classes += [
+        {
+            'cid': '{aaa3f7f2-8ef0-41ec-8d03-aed667cf7fa2}',
+            'contract_ids': ['@mozilla.org/telemetry/geckoview-testing;1'],
+            'type': 'TelemetryGeckoViewTestingImpl',
+            'headers': ['/toolkit/components/telemetry/geckoview/TelemetryGeckoViewTesting.h'],
+        },
+    ]
diff --git a/toolkit/components/processsingleton/ContentProcessSingleton.jsm b/toolkit/components/processsingleton/ContentProcessSingleton.jsm
@@ -10,6 +10,8 @@ const { XPCOMUtils } = ChromeUtils.import(
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
+  GeckoViewTelemetryController:
+    "resource://gre/modules/GeckoViewTelemetryController.jsm",
   TelemetryController: "resource://gre/modules/TelemetryController.jsm",
 });
 
@@ -25,6 +27,14 @@ ContentProcessSingleton.prototype = {
     switch (topic) {
       case "app-startup": {
         Services.obs.addObserver(this, "xpcom-shutdown");
+        // Initialize Telemetry in the content process: use a different
+        // controller depending on the platform.
+        if (
+          Services.prefs.getBoolPref("toolkit.telemetry.isGeckoViewMode", false)
+        ) {
+          GeckoViewTelemetryController.setup();
+          return;
+        }
         // Initialize Firefox Desktop Telemetry.
         TelemetryController.observe(null, topic, null);
         break;