Backed out 4 changesets (bug 1868922, bug 1855375, bug 1874990) for c…

…ausing xpcshell failures in /test_tab_quickwrite.js CLOSED TREE Backed out changeset d558120aba19 (bug 1868922) Backed out changeset e2c1399903d8 (bug 1855375) Backed out changeset de119e6a8ced (bug 1874990) Backed out changeset 3d1ef7c11154 (bug 1874990)
dothq · Jan 18, 2024 · 74c0e58 · 74c0e58
1 parent ac1fd45
commit 74c0e58
Show file tree

Hide file tree

Showing 42 changed files with 83 additions and 1,393 deletions.
diff --git a/.cargo/config.in b/.cargo/config.in
@@ -50,9 +50,9 @@ git = "https://github.com/mozilla-spidermonkey/jsparagus"
 rev = "61f399c53a641ebd3077c1f39f054f6d396a633c"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/mozilla/application-services?rev=63a6260c14847c21c5a1fa3003efaf0114a3e4e5"]
+[source."git+https://github.com/mozilla/application-services?rev=c1e935d9d1d68e2bee323a236e62165ab1bbb2da"]
 git = "https://github.com/mozilla/application-services"
-rev = "63a6260c14847c21c5a1fa3003efaf0114a3e4e5"
+rev = "c1e935d9d1d68e2bee323a236e62165ab1bbb2da"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/mozilla/audioipc?rev=6be424d75f1367e70f2f5ddcacd6d0237e81a6a9"]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -202,13 +202,13 @@ warp = { git = "https://github.com/seanmonstar/warp", rev = "9d081461ae1167eb321
 malloc_size_of_derive = { path = "xpcom/rust/malloc_size_of_derive" }
 
 # application-services overrides to make updating them all simpler.
-interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "63a6260c14847c21c5a1fa3003efaf0114a3e4e5" }
-sql-support = { git = "https://github.com/mozilla/application-services", rev = "63a6260c14847c21c5a1fa3003efaf0114a3e4e5" }
-suggest = { git = "https://github.com/mozilla/application-services", rev = "63a6260c14847c21c5a1fa3003efaf0114a3e4e5" }
-sync15 = { git = "https://github.com/mozilla/application-services", rev = "63a6260c14847c21c5a1fa3003efaf0114a3e4e5" }
-tabs = { git = "https://github.com/mozilla/application-services", rev = "63a6260c14847c21c5a1fa3003efaf0114a3e4e5" }
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "63a6260c14847c21c5a1fa3003efaf0114a3e4e5" }
-webext-storage = { git = "https://github.com/mozilla/application-services", rev = "63a6260c14847c21c5a1fa3003efaf0114a3e4e5" }
+interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "c1e935d9d1d68e2bee323a236e62165ab1bbb2da" }
+sql-support = { git = "https://github.com/mozilla/application-services", rev = "c1e935d9d1d68e2bee323a236e62165ab1bbb2da" }
+suggest = { git = "https://github.com/mozilla/application-services", rev = "c1e935d9d1d68e2bee323a236e62165ab1bbb2da" }
+sync15 = { git = "https://github.com/mozilla/application-services", rev = "c1e935d9d1d68e2bee323a236e62165ab1bbb2da" }
+tabs = { git = "https://github.com/mozilla/application-services", rev = "c1e935d9d1d68e2bee323a236e62165ab1bbb2da" }
+viaduct = { git = "https://github.com/mozilla/application-services", rev = "c1e935d9d1d68e2bee323a236e62165ab1bbb2da" }
+webext-storage = { git = "https://github.com/mozilla/application-services", rev = "c1e935d9d1d68e2bee323a236e62165ab1bbb2da" }
 
 # Patch mio 0.6 to use winapi 0.3 and miow 0.3, getting rid of winapi 0.2.
 # There is not going to be new version of mio 0.6, mio now being >= 0.7.11.

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -641,10 +641,6 @@ pref("browser.urlbar.suggest.addons", true);
 // mdn suggestions are turned on.
 pref("browser.urlbar.suggest.mdn", true);
 
-// If `browser.urlbar.yelp.featureGate` is true, this controls whether
-// Yelp suggestions are turned on.
-pref("browser.urlbar.suggest.yelp", true);
-
 // The minimum prefix length of addons keyword the user must type to trigger
 // the suggestion. 0 means the min length should be taken from Nimbus.
 pref("browser.urlbar.addons.minKeywordLength", 0);

diff --git a/browser/components/urlbar/QuickSuggest.sys.mjs b/browser/components/urlbar/QuickSuggest.sys.mjs
@@ -29,7 +29,6 @@ const FEATURES = {
   SuggestBackendRust:
     "resource:///modules/urlbar/private/SuggestBackendRust.sys.mjs",
   Weather: "resource:///modules/urlbar/private/Weather.sys.mjs",
-  YelpSuggestions: "resource:///modules/urlbar/private/YelpSuggestions.sys.mjs",
 };
 
 const TIMESTAMP_TEMPLATE = "%YYYYMMDDHH%";

diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs
@@ -299,13 +299,6 @@ const PREF_URLBAR_DEFAULTS = new Map([
   // recentsearches are turned on.
   ["suggest.recentsearches", true],
 
-  // If `browser.urlbar.yelp.featureGate` is true, this controls whether
-  // Yelp suggestions are turned on.
-  ["suggest.yelp", true],
-
-  // Feature gate pref for Yelp suggestions in the urlbar.
-  ["yelp.featureGate", false],
-
   // JSON'ed array of blocked quick suggest URL digests.
   ["quicksuggest.blockedDigests", ""],
 

diff --git a/browser/components/urlbar/content/enUS-searchFeatures.ftl b/browser/components/urlbar/content/enUS-searchFeatures.ftl
@@ -141,12 +141,6 @@ firefox-suggest-mdn-bottom-text = { -mdn-brand-name }
 #   $keywordSubstringNotTyped (string) - The part of the suggestion keyword that the user did not yet type
 firefox-suggest-pocket-bottom-text = { -pocket-brand-name } · Related to <strong>{ $keywordSubstringTyped }</strong>{ $keywordSubstringNotTyped }
 
-## These strings are used for Yelp suggestions in the urlbar.
-
-# This string is shown in Yelp suggestions and indicates the suggestion is for
-# Yelp.
-firefox-suggest-yelp-bottom-text = Yelp
-
 ## These strings are used in the preferences UI (about:preferences). Their names
 ## follow the naming conventions of other strings used in the preferences UI.
 

diff --git a/browser/components/urlbar/docs/preferences.rst b/browser/components/urlbar/docs/preferences.rst
@@ -200,10 +200,6 @@ browser.urlbar.suggest.pocket (boolean, default: true)
   If ``browser.urlbar.pocket.featureGate`` is true, this controls whether Pocket
   suggestions are turned on. Otherwise they won't be shown.
 
-browser.urlbar.suggest.yelp (boolean, default: true)
-  If ``browser.urlbar.yelp.featureGate`` is true, this controls whether Yelp
-  suggestions are turned on. Otherwise they won't be shown.
-
 browser.urlbar.switchTabs.adoptIntoActiveWindow (boolean, default: false)
   When using switch to tabs, if set to true this will move the tab into the
   active window, instead of just switching to it.

diff --git a/browser/components/urlbar/moz.build b/browser/components/urlbar/moz.build
@@ -69,7 +69,6 @@ EXTRA_JS_MODULES["urlbar/private"] += [
     "private/SuggestBackendJs.sys.mjs",
     "private/SuggestBackendRust.sys.mjs",
     "private/Weather.sys.mjs",
-    "private/YelpSuggestions.sys.mjs",
 ]
 
 TESTING_JS_MODULES += [

diff --git a/browser/components/urlbar/private/SuggestBackendRust.sys.mjs b/browser/components/urlbar/private/SuggestBackendRust.sys.mjs
@@ -97,6 +97,8 @@ export class SuggestBackendRust extends BaseFeature {
       return [];
     }
 
+    searchString = searchString.toLocaleLowerCase();
+
     // Build the list of Rust providers to query. Each provider is identified by
     // an integer value defined on the `SuggestionProvider` object. Here we
     // convert the Rust suggestion types of our registered features to their

diff --git a/browser/components/urlbar/private/YelpSuggestions.sys.mjs b/browser/components/urlbar/private/YelpSuggestions.sys.mjs
diff --git a/browser/components/urlbar/tests/quicksuggest/browser/browser.toml b/browser/components/urlbar/tests/quicksuggest/browser/browser.toml
@@ -31,8 +31,6 @@ skip-if = ["os == 'linux' && bits == 64"] # Bug 1773830
 ["browser_quicksuggest_pocket.js"]
 tags = "search-telemetry"
 
-["browser_quicksuggest_yelp.js"]
-
 ["browser_telemetry_dynamicWikipedia.js"]
 tags = "search-telemetry"
 

diff --git a/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_yelp.js b/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_yelp.js
diff --git a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_addons.js b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_addons.js
@@ -423,14 +423,6 @@ add_tasks_with_rust(async function remoteSettings() {
         setUtmParams: false,
       }),
     },
-    {
-      input: "FoUrTh",
-      expected: makeExpectedResult({
-        suggestion: REMOTE_SETTINGS_RESULTS[0].attachment[3],
-        source: "remote-settings",
-        setUtmParams: false,
-      }),
-    },
   ];
 
   // Disable Merino so we trigger only remote settings suggestions.

diff --git a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_dynamicWikipedia.js b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_dynamicWikipedia.js
@@ -64,16 +64,6 @@ add_task(async function nonsponsoredDisabled() {
   UrlbarPrefs.clear("suggest.quicksuggest.sponsored");
 });
 
-add_task(async function mixedCaseQuery() {
-  await check_results({
-    context: createContext("TeSt", {
-      providers: [UrlbarProviderQuickSuggest.name],
-      isPrivate: false,
-    }),
-    matches: [makeExpectedResult()],
-  });
-});
-
 function makeExpectedResult() {
   return {
     type: UrlbarUtils.RESULT_TYPE.URL,

diff --git a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_mdn.js b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_mdn.js
@@ -177,19 +177,6 @@ add_task(async function nimbus() {
   await QuickSuggestTestUtils.forceSync();
 });
 
-add_task(async function mixedCaseQuery() {
-  const suggestion = REMOTE_SETTINGS_DATA[0].attachment[1];
-  const keyword = "InPuT";
-
-  await check_results({
-    context: createContext(keyword, {
-      providers: [UrlbarProviderQuickSuggest.name],
-      isPrivate: false,
-    }),
-    matches: [makeExpectedResult({ searchString: keyword, suggestion })],
-  });
-});
-
 function makeExpectedResult({
   searchString,
   suggestion,