Backed out changeset 9018e3691e11 (bug 1378461) for failing browser-chrome's browser_oneOffContextMenu.js. r=backout

browser/base/content/browser.js

@@ -3964,7 +3964,8 @@ const BrowserSearch = {
       return engine.identifier;
     }
 
-    if (!engine || (engine.name === undefined))
+    if (!engine || (engine.name === undefined) ||
+        !Services.prefs.getBoolPref("toolkit.telemetry.enabled"))
       return "other";
 
     return "other-" + engine.name;

browser/modules/BrowserUsageTelemetry.jsm

@@ -112,7 +112,12 @@ function getSearchEngineId(engine) {
     if (engine.identifier) {
       return engine.identifier;
     }
-    if (engine.name) {
+    // Due to bug 1222070, we can't directly check Services.telemetry.canRecordExtended
+    // here.
+    const extendedTelemetry = Services.prefs.getBoolPref("toolkit.telemetry.enabled");
+    if (engine.name && extendedTelemetry) {
+      // If it's a custom search engine only report the engine name
+      // if extended Telemetry is enabled.
       return "other-" + engine.name;
     }
   }