tor-browser

commit c646419334e394cb3129d1806d740206c957b578
parent 8d325ea75a0d9fb4ce81d212192bbd2e19173f95
Author: Drew Willcoxon <adw@mozilla.com>
Date:   Thu, 23 Oct 2025 22:32:05 +0000

Bug 1995362 - Part 2: Make the contextual opt-in use the new online Suggest pref. r=daisuke,Standard8,urlbar-reviewers

This makes the contextual opt-in use the new online Suggest pref. It's not clear
whether we'll use the contextual opt-in again, but it is clear that old online
Suggest and the `dataCollection.enabled` pref will not be supported anymore.

Depends on D269320

Differential Revision: https://phabricator.services.mozilla.com/D269321

Diffstat:
M
browser/components/urlbar/UrlbarProviderQuickSuggestContextualOptIn.sys.mjs
 | 
4
++--
M
browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_contextual_optin.js
 | 
12
++++++------

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/browser/components/urlbar/UrlbarProviderQuickSuggestContextualOptIn.sys.mjs b/browser/components/urlbar/UrlbarProviderQuickSuggestContextualOptIn.sys.mjs
@@ -104,7 +104,7 @@ export class UrlbarProviderQuickSuggestContextualOptIn extends UrlbarProvider {
     if (
       !lazy.UrlbarPrefs.get("quickSuggestEnabled") ||
       !lazy.UrlbarPrefs.get("quicksuggest.contextualOptIn") ||
-      lazy.UrlbarPrefs.get("quicksuggest.dataCollection.enabled")
+      lazy.UrlbarPrefs.get("quicksuggest.online.enabled")
     ) {
       return false;
     }
@@ -273,7 +273,7 @@ export class UrlbarProviderQuickSuggestContextualOptIn extends UrlbarProvider {
         controller.browserWindow.openHelpLink("firefox-suggest");
         break;
       case "allow":
-        lazy.UrlbarPrefs.set("quicksuggest.dataCollection.enabled", true);
+        lazy.UrlbarPrefs.set("quicksuggest.online.enabled", true);
         break;
       case "dismiss":
         this.#dismiss();
diff --git a/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_contextual_optin.js b/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_contextual_optin.js
@@ -5,7 +5,7 @@
 
 add_setup(async function () {
   registerCleanupFunction(async () => {
-    UrlbarPrefs.clear("quicksuggest.dataCollection.enabled");
+    UrlbarPrefs.clear("quicksuggest.online.enabled");
     UrlbarPrefs.clear("quicksuggest.contextualOptIn");
     UrlbarPrefs.clear("quicksuggest.contextualOptIn.lastDismissedTime");
     UrlbarPrefs.clear("quicksuggest.contextualOptIn.dismissedCount");
@@ -27,7 +27,7 @@ add_setup(async function () {
 
 add_task(async function accept() {
   info("Setup");
-  UrlbarPrefs.set("quicksuggest.dataCollection.enabled", false);
+  UrlbarPrefs.set("quicksuggest.online.enabled", false);
   UrlbarPrefs.set("quicksuggest.contextualOptIn", true);
   UrlbarPrefs.set("quicksuggest.contextualOptIn.dismissedCount", 0);
   UrlbarPrefs.set("quicksuggest.contextualOptIn.lastDismissedTime", 0);
@@ -56,7 +56,7 @@ add_task(async function accept() {
       window
     );
   });
-  Assert.ok(UrlbarPrefs.get("quicksuggest.dataCollection.enabled"));
+  Assert.ok(UrlbarPrefs.get("quicksuggest.online.enabled"));
 
   info(
     "Check whether the contextual opt-in result was removed from last query"
@@ -71,7 +71,7 @@ add_task(async function accept() {
 
 add_task(async function dismiss() {
   info("Setup");
-  UrlbarPrefs.set("quicksuggest.dataCollection.enabled", false);
+  UrlbarPrefs.set("quicksuggest.online.enabled", false);
   UrlbarPrefs.set("quicksuggest.contextualOptIn", true);
   UrlbarPrefs.set("quicksuggest.contextualOptIn.lastDismissedTime", 0);
   UrlbarPrefs.set("quicksuggest.contextualOptIn.dismissedCount", 0);
@@ -164,7 +164,7 @@ add_task(async function dismiss_by_impressions_count_fisrt() {
   info("Setup");
   const IMPRESSION_LIMIT = 5;
   const IMPRESSION_DAYS_LIMIT = 10;
-  UrlbarPrefs.set("quicksuggest.dataCollection.enabled", false);
+  UrlbarPrefs.set("quicksuggest.online.enabled", false);
   UrlbarPrefs.set("quicksuggest.contextualOptIn", true);
   UrlbarPrefs.set("quicksuggest.contextualOptIn.dismissedCount", 0);
   UrlbarPrefs.set("quicksuggest.contextualOptIn.lastDismissedTime", 0);
@@ -222,7 +222,7 @@ add_task(async function dismiss_by_impressions_elapsed_days_fisrt() {
   info("Setup");
   const IMPRESSION_LIMIT = 5;
   const IMPRESSION_DAYS_LIMIT = 10;
-  UrlbarPrefs.set("quicksuggest.dataCollection.enabled", false);
+  UrlbarPrefs.set("quicksuggest.online.enabled", false);
   UrlbarPrefs.set("quicksuggest.contextualOptIn", true);
   UrlbarPrefs.set("quicksuggest.contextualOptIn.dismissedCount", 0);
   UrlbarPrefs.set("quicksuggest.contextualOptIn.lastDismissedTime", 0);