From a5b61e18d61d254d34008e0920796436c1c94042 Mon Sep 17 00:00:00 2001
From: Max Smolens <msmolens@gmail.com>
Date: Mon, 15 Aug 2022 11:10:01 +0000
Subject: [PATCH] Bug 1771517 - Update default search engine telemetry when
 changing separatePrivateDefault preferences. r=Standard8

Differential Revision: https://phabricator.services.mozilla.com/D154410
---
 .../components/search/SearchService.sys.mjs   |   4 +-
 .../xpcshell/test_defaultPrivateEngine.js     | 148 ++++++++++++++++++
 2 files changed, 150 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/search/SearchService.sys.mjs b/toolkit/components/search/SearchService.sys.mjs
index 338985834339..b2cf2550ae63 100644
--- a/toolkit/components/search/SearchService.sys.mjs
+++ b/toolkit/components/search/SearchService.sys.mjs
@@ -2796,9 +2796,9 @@ export class SearchService {
         this.defaultPrivateEngine,
         lazy.SearchUtils.MODIFIED_TYPE.DEFAULT_PRIVATE
       );
-      // Also update the telemetry data.
-      this.#recordTelemetryData();
     }
+    // Update the telemetry data.
+    this.#recordTelemetryData();
   }
 
   #getEngineInfo(engine) {
diff --git a/toolkit/components/search/tests/xpcshell/test_defaultPrivateEngine.js b/toolkit/components/search/tests/xpcshell/test_defaultPrivateEngine.js
index f5c3954582d6..e2558f687971 100644
--- a/toolkit/components/search/tests/xpcshell/test_defaultPrivateEngine.js
+++ b/toolkit/components/search/tests/xpcshell/test_defaultPrivateEngine.js
@@ -428,3 +428,151 @@ add_task(async function test_defaultPrivateEngine_ui_turned_off() {
     },
   });
 });
+
+add_task(async function test_defaultPrivateEngine_same_engine_toggle_pref() {
+  Services.prefs.setBoolPref(
+    SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
+    true
+  );
+  Services.prefs.setBoolPref(
+    SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled",
+    true
+  );
+
+  // Set the normal and private engines to be the same
+  Services.search.defaultEngine = engine2;
+  Services.search.defaultPrivateEngine = engine2;
+
+  await assertGleanDefaultEngine({
+    normal: {
+      engineId: "engine-chromeicon",
+    },
+    private: {
+      engineId: "engine-chromeicon",
+    },
+  });
+
+  // Disable pref
+  Services.prefs.setBoolPref(
+    SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
+    false
+  );
+  Assert.equal(
+    Services.search.defaultPrivateEngine,
+    engine2,
+    "Should not change the default private engine"
+  );
+  Assert.equal(
+    Services.search.defaultEngine,
+    engine2,
+    "Should not change the default engine"
+  );
+
+  await assertGleanDefaultEngine({
+    normal: {
+      engineId: "engine-chromeicon",
+    },
+    private: {
+      engineId: "",
+    },
+  });
+
+  // Re-enable pref
+  Services.prefs.setBoolPref(
+    SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
+    true
+  );
+  Assert.equal(
+    Services.search.defaultPrivateEngine,
+    engine2,
+    "Should not change the default private engine"
+  );
+  Assert.equal(
+    Services.search.defaultEngine,
+    engine2,
+    "Should not change the default engine"
+  );
+
+  await assertGleanDefaultEngine({
+    normal: {
+      engineId: "engine-chromeicon",
+    },
+    private: {
+      engineId: "engine-chromeicon",
+    },
+  });
+});
+
+add_task(async function test_defaultPrivateEngine_same_engine_toggle_ui_pref() {
+  Services.prefs.setBoolPref(
+    SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
+    true
+  );
+  Services.prefs.setBoolPref(
+    SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled",
+    true
+  );
+
+  // Set the normal and private engines to be the same
+  Services.search.defaultEngine = engine2;
+  Services.search.defaultPrivateEngine = engine2;
+
+  await assertGleanDefaultEngine({
+    normal: {
+      engineId: "engine-chromeicon",
+    },
+    private: {
+      engineId: "engine-chromeicon",
+    },
+  });
+
+  // Disable UI pref
+  Services.prefs.setBoolPref(
+    SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled",
+    false
+  );
+  Assert.equal(
+    Services.search.defaultPrivateEngine,
+    engine2,
+    "Should not change the default private engine"
+  );
+  Assert.equal(
+    Services.search.defaultEngine,
+    engine2,
+    "Should not change the default engine"
+  );
+
+  await assertGleanDefaultEngine({
+    normal: {
+      engineId: "engine-chromeicon",
+    },
+    private: {
+      engineId: "",
+    },
+  });
+
+  // Re-enable UI pref
+  Services.prefs.setBoolPref(
+    SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled",
+    true
+  );
+  Assert.equal(
+    Services.search.defaultPrivateEngine,
+    engine2,
+    "Should not change the default private engine"
+  );
+  Assert.equal(
+    Services.search.defaultEngine,
+    engine2,
+    "Should not change the default engine"
+  );
+
+  await assertGleanDefaultEngine({
+    normal: {
+      engineId: "engine-chromeicon",
+    },
+    private: {
+      engineId: "engine-chromeicon",
+    },
+  });
+});