Bug 1272294 - only collect non-default search engine names if the user opted into telemetry, r=florian

MozReview-Commit-ID: 2mHHKBJyI6P

--HG--
extra : rebase_source : cbcb441527282891a2b3b6dcaa8f2da5e8543ccc

browser/base/content/browser.js

@@ -3656,18 +3656,17 @@ const BrowserSearch = {
     openUILinkIn(searchEnginesURL, where);
   },
 
-  _getSearchEngineId: function (engine) {
-    if (!engine) {
-      return "other";
-    }
+  get _isExtendedTelemetryEnabled() {
+    return Services.prefs.getBoolPref("toolkit.telemetry.enabled");
+  },
 
-    if (engine.identifier) {
+  _getSearchEngineId: function (engine) {
+    if (engine && engine.identifier) {
       return engine.identifier;
     }
 
-    if (!("name" in engine) || engine.name === undefined) {
+    if (!engine || (engine.name === undefined) || !this._isExtendedTelemetryEnabled)
       return "other";
-    }
 
     return "other-" + engine.name;
   },

browser/components/search/test/browser_contextSearchTabPosition.js

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 add_task(function* test() {
+  yield SpecialPowers.pushPrefEnv({set: [["toolkit.telemetry.enabled", true]]});
   let engine = yield promiseNewEngine("testEngine.xml");
   let histogramKey = "other-" + engine.name + ".contextmenu";
   let numSearchesBefore = 0;

browser/components/search/test/browser_healthreport.js

@@ -70,9 +70,10 @@ function test() {
   }
 
   Services.obs.addObserver(observer, "browser-search-engine-modified", false);
-  Services.search.addEngine("http://mochi.test:8888/browser/browser/components/search/test/testEngine.xml",
-                            null, "data:image/x-icon,%00", false);
-
+  SpecialPowers.pushPrefEnv({set: [["toolkit.telemetry.enabled", true]]}).then(function() {
+    Services.search.addEngine("http://mochi.test:8888/browser/browser/components/search/test/testEngine.xml",
+                              null, "data:image/x-icon,%00", false);
+  });
 }
 
 function resetPreferences() {