Bug 1961039 - Vendor application-services 6a007c9. r=daisuke,nanj

This includes some small fixes to desktop Suggest code and tests due to changes
in the `suggest` app-services component. It also incorporates D243740 by
@daisuke since it's required for vendoring.

This vendor replaces exposure suggestions with dynamic suggestions in the
`suggest` component, which breaks a few desktop tests. I disabled them for now
and will address them in bug 1961040.

Depends on D244233

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

.cargo/config.toml.in

@@ -70,9 +70,9 @@ git = "https://github.com/jfkthame/mapped_hyph.git"
 rev = "eff105f6ad7ec9b79816cfc1985a28e5340ad14b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499"]
+[source."git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217"]
 git = "https://github.com/mozilla/application-services"
-rev = "e18923d336cb3e17e3d411c2a943631a3691c499"
+rev = "6a007c98292fa72965d36389ce32d7609e399217"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/mozilla/audioipc?rev=e6f44a2bd1e57d11dfc737632a9e849077632330"]

Cargo.lock

@@ -1792,7 +1792,7 @@ dependencies = [
 [[package]]
 name = "error-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "error-support-macros",
  "lazy_static",
@@ -1804,7 +1804,7 @@ dependencies = [
 [[package]]
 name = "error-support-macros"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1921,7 +1921,7 @@ dependencies = [
 [[package]]
 name = "firefox-versioning"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "serde_json",
  "thiserror 1.999.999",
@@ -3233,7 +3233,7 @@ dependencies = [
 [[package]]
 name = "interrupt-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "lazy_static",
  "parking_lot",
@@ -4944,7 +4944,7 @@ checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
 [[package]]
 name = "payload-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "serde",
  "serde_derive",
@@ -5447,7 +5447,7 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 [[package]]
 name = "relevancy"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "anyhow",
  "base64 0.21.999",
@@ -5472,7 +5472,7 @@ dependencies = [
 [[package]]
 name = "remote_settings"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "anyhow",
  "camino",
@@ -5813,7 +5813,7 @@ dependencies = [
 [[package]]
 name = "search"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "error-support",
  "firefox-versioning",
@@ -6104,7 +6104,7 @@ dependencies = [
 [[package]]
 name = "sql-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "interrupt-support",
  "lazy_static",
@@ -6303,7 +6303,7 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 [[package]]
 name = "suggest"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "anyhow",
  "chrono",
@@ -6355,7 +6355,7 @@ dependencies = [
 [[package]]
 name = "sync-guid"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "base64 0.21.999",
  "rand",
@@ -6366,7 +6366,7 @@ dependencies = [
 [[package]]
 name = "sync15"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "anyhow",
  "error-support",
@@ -6406,7 +6406,7 @@ dependencies = [
 [[package]]
 name = "tabs"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "anyhow",
  "error-support",
@@ -6750,7 +6750,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "types"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "rusqlite 0.33.0",
  "serde",
@@ -7132,7 +7132,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 [[package]]
 name = "viaduct"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "ffi-support",
  "log",
@@ -7302,7 +7302,7 @@ dependencies = [
 [[package]]
 name = "webext-storage"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=e18923d336cb3e17e3d411c2a943631a3691c499#e18923d336cb3e17e3d411c2a943631a3691c499"
+source = "git+https://github.com/mozilla/application-services?rev=6a007c98292fa72965d36389ce32d7609e399217#6a007c98292fa72965d36389ce32d7609e399217"
 dependencies = [
  "anyhow",
  "error-support",

Cargo.toml

@@ -253,14 +253,14 @@ malloc_size_of_derive = { path = "xpcom/rust/malloc_size_of_derive" }
 objc = { git = "https://github.com/glandium/rust-objc", rev = "4de89f5aa9851ceca4d40e7ac1e2759410c04324" }
 
 # application-services overrides to make updating them all simpler.
-interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "e18923d336cb3e17e3d411c2a943631a3691c499" }
+interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "6a007c98292fa72965d36389ce32d7609e399217" }
-relevancy = { git = "https://github.com/mozilla/application-services", rev = "e18923d336cb3e17e3d411c2a943631a3691c499" }
+relevancy = { git = "https://github.com/mozilla/application-services", rev = "6a007c98292fa72965d36389ce32d7609e399217" }
-search = { git = "https://github.com/mozilla/application-services", rev = "e18923d336cb3e17e3d411c2a943631a3691c499" }
+search = { git = "https://github.com/mozilla/application-services", rev = "6a007c98292fa72965d36389ce32d7609e399217" }
-sql-support = { git = "https://github.com/mozilla/application-services", rev = "e18923d336cb3e17e3d411c2a943631a3691c499" }
+sql-support = { git = "https://github.com/mozilla/application-services", rev = "6a007c98292fa72965d36389ce32d7609e399217" }
-suggest = { git = "https://github.com/mozilla/application-services", rev = "e18923d336cb3e17e3d411c2a943631a3691c499" }
+suggest = { git = "https://github.com/mozilla/application-services", rev = "6a007c98292fa72965d36389ce32d7609e399217" }
-sync15 = { git = "https://github.com/mozilla/application-services", rev = "e18923d336cb3e17e3d411c2a943631a3691c499" }
+sync15 = { git = "https://github.com/mozilla/application-services", rev = "6a007c98292fa72965d36389ce32d7609e399217" }
-tabs = { git = "https://github.com/mozilla/application-services", rev = "e18923d336cb3e17e3d411c2a943631a3691c499" }
+tabs = { git = "https://github.com/mozilla/application-services", rev = "6a007c98292fa72965d36389ce32d7609e399217" }
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "e18923d336cb3e17e3d411c2a943631a3691c499" }
+viaduct = { git = "https://github.com/mozilla/application-services", rev = "6a007c98292fa72965d36389ce32d7609e399217" }
-webext-storage = { git = "https://github.com/mozilla/application-services", rev = "e18923d336cb3e17e3d411c2a943631a3691c499" }
+webext-storage = { git = "https://github.com/mozilla/application-services", rev = "6a007c98292fa72965d36389ce32d7609e399217" }
 
 allocator-api2 = { path = "third_party/rust/allocator-api2" }

browser/components/urlbar/QuickSuggest.sys.mjs

@@ -20,8 +20,9 @@ const FEATURES = {
   AmpSuggestions: "resource:///modules/urlbar/private/AmpSuggestions.sys.mjs",
   BlockedSuggestions:
     "resource:///modules/urlbar/private/BlockedSuggestions.sys.mjs",
-  ExposureSuggestions:
+  // TODO Bug 1961040: Convert ExposureSuggestions to DynamicSuggestions.
-    "resource:///modules/urlbar/private/ExposureSuggestions.sys.mjs",
+  // ExposureSuggestions:
+  //  "resource:///modules/urlbar/private/ExposureSuggestions.sys.mjs",
   FakespotSuggestions:
     "resource:///modules/urlbar/private/FakespotSuggestions.sys.mjs",
   ImpressionCaps: "resource:///modules/urlbar/private/ImpressionCaps.sys.mjs",

browser/components/urlbar/private/SuggestBackendRust.sys.mjs

@@ -438,12 +438,19 @@ export class SuggestBackendRust extends SuggestBackend {
       return null;
     }
 
-    let customTargetingAttributes = {
+    let rsContext = {
       formFactor: "desktop",
+      appId: Services.appinfo.ID || "",
+      channel: AppConstants.IS_ESR ? "esr" : AppConstants.MOZ_UPDATE_CHANNEL,
+      appVersion: Services.appinfo.version,
+      locale: Services.locale.appLocaleAsBCP47,
+      os: AppConstants.platform,
+      osVersion: Services.sysinfo.get("version"),
     };
-    if (lazy.Region.home) {
+
     // We assume `QuickSuggest` init already awaited `Region.init()`.
-      customTargetingAttributes.country = lazy.Region.home;
+    if (lazy.Region.home) {
+      rsContext.country = lazy.Region.home;
     }
 
     let rsService;
@@ -453,22 +460,7 @@ export class SuggestBackendRust extends SuggestBackend {
         new lazy.RemoteSettingsConfig2({
           server: this.#remoteSettingsServer,
           bucketName: this.#remoteSettingsBucketName,
-          appContext: new lazy.RemoteSettingsContext({
+          appContext: new lazy.RemoteSettingsContext(rsContext),
-            appName: Services.appinfo.name || "",
-            appId: Services.appinfo.ID || "",
-            channel: AppConstants.IS_ESR
-              ? "esr"
-              : AppConstants.MOZ_UPDATE_CHANNEL,
-            appVersion: Services.appinfo.version,
-            appBuild: Services.appinfo.appBuildID,
-            architecture: Services.sysinfo.get("arch"),
-            locale: Services.locale.appLocaleAsBCP47,
-            os: AppConstants.platform,
-            osVersion: Services.sysinfo.get("version"),
-            customTargetingAttributes: JSON.stringify(
-              customTargetingAttributes
-            ),
-          }),
         })
       );
     } catch (error) {

browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_exposure.js

@@ -681,6 +681,11 @@ add_task(async function manyQueries_manyExposureResults_hidden_5() {
 });
 
 add_task(async function suggestExposure_matched() {
+  // TODO Bug 1961040: Convert ExposureSuggestions to DynamicSuggestions.
+  info("Skipping task: TODO Bug 1961040");
+  return;
+
+  // eslint-disable-next-line no-unreachable
   await doExposureTest({
     prefs: [["quicksuggest.exposureSuggestionTypes", "aaa"]],
     queries: [
@@ -694,6 +699,11 @@ add_task(async function suggestExposure_matched() {
 });
 
 add_task(async function suggestExposure_notMatched() {
+  // TODO Bug 1961040: Convert ExposureSuggestions to DynamicSuggestions.
+  info("Skipping task: TODO Bug 1961040");
+  return;
+
+  // eslint-disable-next-line no-unreachable
   await doExposureTest({
     prefs: [["quicksuggest.exposureSuggestionTypes", "aaa"]],
     queries: [
@@ -707,6 +717,11 @@ add_task(async function suggestExposure_notMatched() {
 });
 
 add_task(async function suggestExposure_showExposureResults() {
+  // TODO Bug 1961040: Convert ExposureSuggestions to DynamicSuggestions.
+  info("Skipping task: TODO Bug 1961040");
+  return;
+
+  // eslint-disable-next-line no-unreachable
   await doExposureTest({
     prefs: [
       ["quicksuggest.exposureSuggestionTypes", "aaa"],

browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.sys.mjs

@@ -383,12 +383,14 @@ class _QuickSuggestTestUtils {
    */
   ampRemoteSettings({
     keywords = ["amp"],
+    full_keywords = keywords.map(kw => [kw, 1]),
     url = "https://example.com/amp",
     title = "Amp Suggestion",
     score = 0.3,
   } = {}) {
     return {
       keywords,
+      full_keywords,
       url,
       title,
       score,

browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest.js

@@ -8,7 +8,10 @@
  */
 
 const REMOTE_SETTINGS_RESULTS = [
-  QuickSuggestTestUtils.ampRemoteSettings({ keywords: ["fra", "frab"] }),
+  QuickSuggestTestUtils.ampRemoteSettings({
+    keywords: ["fra", "frab"],
+    full_keywords: [["frab", 2]],
+  }),
   QuickSuggestTestUtils.wikipediaRemoteSettings(),
 ];
 

browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_yelp.js

@@ -12,7 +12,7 @@ const REMOTE_SETTINGS_RECORDS = [
       subjects: ["ramen"],
       preModifiers: ["best"],
       postModifiers: ["delivery"],
-      locationSigns: [{ keyword: "in", needLocation: true }],
+      locationSigns: ["in"],
       yelpModifiers: [],
       icon: "1234",
       score: 0.5,

browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest.js

@@ -46,6 +46,7 @@ const REMOTE_SETTINGS_RESULTS = [
     url: "http://" + PREFIX_SUGGESTIONS_STRIPPED_URL,
     title: "HTTP Suggestion",
     keywords: [HTTP_SEARCH_STRING],
+    full_keywords: [[HTTP_SEARCH_STRING, 1]],
     click_url: "http://example.com/http-click",
     impression_url: "http://example.com/http-impression",
     advertiser: "HttpAdvertiser",
@@ -57,6 +58,7 @@ const REMOTE_SETTINGS_RESULTS = [
     url: "https://" + PREFIX_SUGGESTIONS_STRIPPED_URL,
     title: "https suggestion",
     keywords: [HTTPS_SEARCH_STRING],
+    full_keywords: [[HTTPS_SEARCH_STRING, 1]],
     click_url: "http://click.reporting.test.com/prefix",
     impression_url: "http://impression.reporting.test.com/prefix",
     advertiser: "TestAdvertiserPrefix",
@@ -68,6 +70,7 @@ const REMOTE_SETTINGS_RESULTS = [
     url: TIMESTAMP_SUGGESTION_URL,
     title: "Timestamp suggestion",
     keywords: [TIMESTAMP_SEARCH_STRING],
+    full_keywords: [[TIMESTAMP_SEARCH_STRING, 1]],
     click_url: TIMESTAMP_SUGGESTION_CLICK_URL,
     impression_url: "http://impression.reporting.test.com/timestamp",
     advertiser: "TestAdvertiserTimestamp",
@@ -88,6 +91,10 @@ const REMOTE_SETTINGS_RESULTS = [
       "amp full keyword",
       "xyz",
     ],
+    full_keywords: [
+      ["amp full keyword", 5],
+      ["xyz", 1],
+    ],
     title: "AMP suggestion with full keyword and prefix keywords",
     url: "https://example.com/amp-full-keyword",
   }),
@@ -99,6 +106,7 @@ const REMOTE_SETTINGS_RESULTS = [
       "wikipedia full keywor",
       "wikipedia full keyword",
     ],
+    full_keywords: [["wikipedia full keyword", 5]],
     title: "Wikipedia suggestion with full keyword and prefix keywords",
     url: "https://example.com/wikipedia-full-keyword",
   }),

browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_yelp.js

@@ -15,10 +15,7 @@ const REMOTE_SETTINGS_RECORDS = [
       subjects: ["ramen", "ab", "alongerkeyword", "1234"],
       preModifiers: ["best"],
       postModifiers: ["delivery"],
-      locationSigns: [
+      locationSigns: ["in", "nearby"],
-        { keyword: "in", needLocation: true },
-        { keyword: "nearby", needLocation: false },
-      ],
       yelpModifiers: [],
       icon: "1234",
       score: 0.5,
@@ -89,8 +86,8 @@ add_task(async function basic() {
       description: "No specific location with location-modifier",
       query: "ramen nearby",
       expected: {
-        url: "https://www.yelp.com/search?find_desc=ramen+nearby&find_loc=Yokohama%2C+Kanagawa",
+        url: "https://www.yelp.com/search?find_desc=ramen&find_loc=Yokohama%2C+Kanagawa",
-        title: "ramen nearby in Yokohama, Kanagawa",
+        title: "ramen nearby Yokohama, Kanagawa",
       },
     },
     {

browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_yelp_ml.js

@@ -19,10 +19,7 @@ const REMOTE_SETTINGS_RECORDS = [
       subjects: ["coffee"],
       preModifiers: [],
       postModifiers: [],
-      locationSigns: [
+      locationSigns: ["in", "nearby"],
-        { keyword: "in", needLocation: true },
-        { keyword: "nearby", needLocation: false },
-      ],
       yelpModifiers: [],
       icon: "1234",
       score: 0.5,

browser/components/urlbar/tests/quicksuggest/unit/test_rust_ingest.js

@@ -10,6 +10,7 @@ ChromeUtils.defineESModuleGetters(this, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
   InterruptKind: "resource://gre/modules/RustSuggest.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
+  SuggestIngestionMetrics: "resource://gre/modules/RustSuggest.sys.mjs",
   SuggestionProvider: "resource://gre/modules/RustSuggest.sys.mjs",
 });
 
@@ -79,7 +80,8 @@ add_task(async function disableEnable() {
 
 // For a feature whose suggestion type provider has constraints, ingest should
 // happen when the constraints change.
-add_task(async function providerConstraintsChanged() {
+// TODO Bug 1961040: Convert ExposureSuggestions to DynamicSuggestions.
+add_task({ skip_if: () => true }, async function providerConstraintsChanged() {
   // We'll use the Exposure feature since it has provider constraints. Make sure
   // it exists.
   let feature = QuickSuggest.getFeature("ExposureSuggestions");
@@ -264,6 +266,12 @@ async function withIngestStub(callback) {
   let sandbox = sinon.createSandbox();
   let { rustBackend } = QuickSuggest;
   let stub = sandbox.stub(rustBackend._test_store, "ingest");
+
+  // `ingest()` returns a `SuggestIngestionMetrics` object.
+  stub.returns(
+    new SuggestIngestionMetrics({ ingestionTimes: [], downloadTimes: [] })
+  );
+
   await callback({ stub, rustBackend });
   sandbox.restore();
 }

browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml

@@ -14,8 +14,10 @@ firefox-appdir = "browser"
 ["test_quicksuggest_dynamicWikipedia.js"]
 
 ["test_quicksuggest_exposures.js"]
+skip-if = ["true"] # Bug 1961040
 
 ["test_quicksuggest_exposures_locales.js"]
+skip-if = ["true"] # Bug 1961040
 
 ["test_quicksuggest_fakespot.js"]
 

third_party/rust/remote_settings/Cargo.toml

@@ -92,6 +92,9 @@ expect-test = "1.4"
 mockall = "0.11"
 mockito = "0.31"
 
+[dev-dependencies.nss]
+path = "../support/rc_crypto/nss"
+
 [dev-dependencies.serde_json]
 version = "1"
 features = ["preserve_order"]

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/d0ab8a9e-0dc4-476b-bdb0-81b1d9b8f6cf.ico",
+  "hash": "fdadf15c6eae7933c3d254ae6311112e0bc8a422c38c758189dbe6a4d7f6b718",
+  "size": 5430
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/3d9337c7-0654-475b-bc03-710e0400b35e.ico",
+  "hash": "b75ef04a805325e303c4195833cdd077d3d406f360b25b72502fc55880b9150b",
+  "size": 2053
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/0a57b0cf-34f0-4d09-96e4-dbd6e3355410.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/47936bf8-71bd-4c9a-9a00-58920177458b.png",
+  "hash": "a7493c6a9d70d60acccf73f62dcbc127a580469570aee60b7482cd42cdb59f69",
+  "size": 724
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/82083e19-25c5-4c3c-b269-3d8c0173e4e2.ico",
+  "hash": "7042293af6b04e421cb7b68dc599ac644b76939cdcf5970159e44f658dd6a0cc",
+  "size": 5430
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/e9432c7b-e80b-49ad-9c4f-8a69df8a63b4.png",
+  "hash": "64800e32b24b2c8c0582750e1657426d56abd74b65682e20e892f82710d120b6",
+  "size": 790
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/101ce01d-2691-b729-7f16-9d389803384b.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/bcdcafec-9b52-4f8b-82fe-abdb2c533cdb.ico",
+  "hash": "62d2faa3a8322b1f643aab6e045837500ebe3049c5cb140cb44c4dfc7290337a",
+  "size": 884
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/84ce4b9c-3998-4ca7-9856-3c9cb019da95.ico",
+  "hash": "3b88f3ef3cbfaed127d679ec7e44a44fe8dcad688feb89a70a1a9447c1460d15",
+  "size": 1406
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/a0cb1b08-4911-4db8-90f3-ee87da5bb9b5.png",
+  "hash": "828c3ca82e9be483ae583e5a705dde57b24fd8431e192e3a2d0809871992afa5",
+  "size": 1122
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/4111bef2-7258-4c9b-9f64-77cf545b697f.ico",
+  "hash": "723ac3228124926537d5a61284d60e198a52895195f9f69b967c578ef7a012ad",
+  "size": 5430
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/9b60e56c-34cc-4447-a20d-21b4ecad7e8a.ico",
+  "hash": "16ea89d4baa39529d7a84d5152867a4c6ed6867198c4dfa1648b1f43ce6a3f6f",
+  "size": 1407
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/2ecca3f8-c1ef-43cc-b053-886d1ae46c36.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/f58670d9-93b2-413e-a2fa-ba29c401d669.png",
+  "hash": "774f0a7a613c6c5bea642e3628fa7436851de79e7da9713ad0c96d5db7f44300",
+  "size": 694
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/9526a092-69d3-4010-bf09-d426f5574c5b.png",
+  "hash": "a64f553b79fbb8c45734310dac401ad253ccd05aeabfa58bb5541daa6d8caf70",
+  "size": 252
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/39d0b17d-c020-4890-932f-83c0f6ed130b.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/02277a17-bb75-4e5f-94a8-abb34005298c.png",
+  "hash": "4f409c3ffc67cfa870b05e4089b6ffc3fc81448fa60afba447f0177cd1192b1e",
+  "size": 3370
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/41135a88-093d-4077-873b-9de1ae133427.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/d992fe72-6c09-4fb4-aec3-97206bb906c1.png",
+  "hash": "c2718c5e416670426475dd8cc496f5464bf95224e8f8f0a72b695360ddc917c0",
+  "size": 344
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/41f0d805-3775-4988-8d8c-5ad8ccd86d1c.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/3f1e8b4b-0328-4247-bb3f-e190472e794f.png",
+  "hash": "755b8939c63b1fcc9acd05cd33ffed675397516d37b5bd8f3a03875e25d3fb43",
+  "size": 1070
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/33e52a1d-1883-4a4b-aaf6-7e4f5b52cdfb.ico",
+  "hash": "d7fdfd971d874f2ec6f209df6f6b8173d126cd3f7a25daacb94de4259efbcf16",
+  "size": 5430
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/48c72361-cd67-412e-bd7f-f81a43c10791.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/63c435c1-78a4-49cb-8e03-79d9595d2d3b.png",
+  "hash": "92da7ef030e1d3ed97235748156383e5d75fa6d2744bd124334ab47dc0b689a1",
+  "size": 984
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/2323c216-89f9-43e7-a519-9a23a256aa45.png",
+  "hash": "189ed3031a2cefd3150c9e5b37bee1ffbc1f7850f7ac0621e4b8d262f2c1048c",
+  "size": 2639
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/1e37d101-2191-45e3-8d61-9c1bea44ebce.png",
+  "hash": "9140bd1b30953f41bc758d2c0ecc873f5163e4f51126c278991eccd38589c541",
+  "size": 283
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/5203dd03-2c55-4b53-9c60-58258d587be1.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/6c6e0ca2-8870-423e-ac7c-1abae0b71fdf.png",
+  "hash": "adb29f6fd95956401630d94967381ac473f57215d96a5bcf500a00e747731380",
+  "size": 3393
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/5914932e-66ba-4126-8be5-d37beadd9532.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/b407dc78-50ae-41c4-95d2-25a442c4bd59.pdf",
+  "hash": "02f54211387baa59e4246356dc7344e48f39a412f2e5993d7f403aa538df7276",
+  "size": 4172
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/4ffe56b6-6f76-4841-9f79-cd5e7dac0e10.ico",
+  "hash": "877fb3aca13d2a7c656df1f94df3fa052afbb40b65c99ba5382392ff5499016e",
+  "size": 5430
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/c7aa740f-cef2-45da-aaba-331a74425985.ico",
+  "hash": "9cd3da38e3938549434d1c3cba6fed249ffa7d91d9a6d7ffb5f4184f527cac76",
+  "size": 5430
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/6644f26f-28ea-4222-929d-5d43a02dae05.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/a38c58c7-8ea3-4532-b120-64dc0654a96c.png",
+  "hash": "4f1bfbfec1441bd9a304ca7f3b8fd54130e94df185f7b28bb17c86ba517e13b7",
+  "size": 1021
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/d0e5c407-7b88-4030-8870-f44498141ec7.jpg",
+  "hash": "f895a965b68d02e7391cc4504d9be75e1ba7f9b50a1dd59af77bb44a7769c08c",
+  "size": 1091
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/6e36a151-e4f4-4117-9067-1ca82c47d01a.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/38dc27d1-ee3d-4f69-b74c-ee9b90b7c936.png",
+  "hash": "e9849089ffced59563896974afee0fceedac7fc8455bbeaa5bae230f54c933d9",
+  "size": 1100
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/45da3463-8c66-4b48-a422-00c54f44a96b.ico",
+  "hash": "dd5cab3711f778677859e86000a127ed07a6175e8e58aecb0fba71b825ce76d7",
+  "size": 3638
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7072564d-a573-4750-bf33-f0a07631c9eb.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/3481d42d-8933-4ea7-a84e-84fc1090762c.png",
+  "hash": "0a653ea57472694ac05623d9b237e479232a0d65683d05f89661f996054e3276",
+  "size": 409
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/5a9068cd-a4fa-4600-97fc-59f380e3d651.ico",
+  "hash": "31a793dad95b5ffd02d39ebf14fc40877596f418f5926247487265034181dc8f",
+  "size": 1455
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/71f41a0c-5b70-4116-b30f-e62089083522.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/35e03899-b7d2-446e-87fb-c721f97c0227.png",
+  "hash": "5aad083bfcef256d433c1ffa571b814d16f61832bcd7565bf03909011f6a0bfc",
+  "size": 2350
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/b071a229-712f-4e13-99f4-61283d1c3fb4.ico",
+  "hash": "ca8f102ac4f35189ebcb786d080843b603b234f89b8d8b1c0ef27a0ab7148182",
+  "size": 5430
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/74f94dc2-caf6-4b90-b3d2-f3e2f7714d88.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/afe38f84-b99d-418b-b721-9a9615e7f2a0.png",
+  "hash": "3376e14529ed2e96c7dc491b3bf11914d7c8ff47a068311b2432c086c2ae0f28",
+  "size": 1490
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/764e3b14-fe16-4feb-8384-124c516a5afa.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/48ee1c5c-9251-4ee2-af65-52eed830812e.png",
+  "hash": "71413ef23ac14ce2b7bb76f7f5d16b2df267239841a88ddab36b129481e00616",
+  "size": 2533
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/4d6f988d-8905-4aa7-aeea-5b04a6197767.ico",
+  "hash": "24daa27a3234d01b5add42e027b0a34000d0ab47c17fe3924c2ca267b7b61c19",
+  "size": 5430
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7bf4ca37-e2b8-4d31-a1c3-979bc0e85131

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H12C14.2091 0 16 1.79086 16 4V12C16 14.2091 14.2091 16 12 16H4C1.79086 16 0 14.2091 0 12V4Z" fill="#212327"/>
+<path d="M11.8502 2.79748L12.1849 1.5H12.31L12.6447 2.79748L13.9561 3.1358V3.25361L12.6447 3.59193L12.31 4.88943H12.1849L11.8502 3.59193L10.5667 3.26083V3.12858L11.8502 2.79748Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.69832 3.95863C9.74084 3.95863 11.3966 5.19132 11.3966 7.58549C11.3966 9.85126 9.93369 11.062 8.06173 11.1992C8.95216 11.7432 10.2966 11.7439 11.1329 11.0337L11.394 11.1753L11.1011 12.6388L10.9931 12.7749C9.50831 13.2117 8.16131 12.7276 7.2213 11.1896C5.40411 11.0129 4 9.80865 4 7.58549C4 5.19066 5.6558 3.95863 7.69832 3.95863ZM7.69847 10.5683C9.01075 10.5683 9.64116 9.23283 9.64116 7.58549C9.64116 5.93814 9.09488 4.60271 7.69847 4.60271C6.34136 4.60271 5.75578 5.93814 5.75578 7.58549C5.75578 9.23283 6.31842 10.5683 7.69847 10.5683Z" fill="#F9FAFB"/>
+</svg>

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7bf4ca37-e2b8-4d31-a1c3-979bc0e85131.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/59fbd815-ba40-494a-b56a-40b3531dd10b.svg",
+  "hash": "912d20feefcba57d43bffff5e245b8c1e3865155ed686d8ad253bbab71116e83",
+  "size": 1054
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7c81cf98-7c11-4afd-8279-db89118a6dfb.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/79622d89-5cdc-445b-91b4-dc56307e93b2.png",
+  "hash": "e988445d87afe0d285bea251705fc23eb70ac42426ab0d7a69d9276585c5573c",
+  "size": 3322
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7cb4d88a-d4df-45b2-87e4-f896eaf1bbdb.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/5ce8899a-56a5-4e20-a84d-8010bf48c898.png",
+  "hash": "8dc2e75e6792b8374b20621fa2151ac24b4626e5c1f6a1abec4f912746441859",
+  "size": 3202
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7edaf4fe-a8a0-432b-86d2-bf75ebe80851.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/d9917c97-4593-4596-8ef0-cf0635e8aa36.png",
+  "hash": "27541cb376bdda829a6cf9cefd13da112728881e3daa4ac3c1178d4ce15f1e8b",
+  "size": 1571
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/2951bdf6-b440-4543-83ba-4ca1318db69e.ico",
+  "hash": "b0c6d1850265e3c946917232ca6c6ace3dad23347bfab4f81351eac569326d34",
+  "size": 2584
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/aae88ab5-7f9e-4bd6-80cd-9bb0f6638a19.ico",
+  "hash": "a1fd5d127a5f2590ddcd439b7a2abb3456b48217ea11daf0345b26e108f520e6",
+  "size": 1743
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/4c43dc1a-e163-4560-9713-fae61c9c59b9.ico",
+  "hash": "33ca72f1eac56793d1fd811189cedef98004a067c85b1143083b564814a4b0db",
+  "size": 1150
+}

third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e.meta.json

@@ -0,0 +1,5 @@
+{
+  "location": "main-workspace/search-config-icons/3ce9df7f-3e0a-4b26-add1-18e2857f6213.ico",
+  "hash": "ca3cc8786977f6ffeb0546ff8f3bb2b7fd240d1956fbf86777dbf0e8bec9c03b",
+  "size": 5430
+}