[pull] main from mozilla-firefox:main

.cargo/config.toml.in

@@ -75,9 +75,9 @@ git = "https://github.com/jfkthame/mapped_hyph.git"
 rev = "eff105f6ad7ec9b79816cfc1985a28e5340ad14b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"]
+[source."git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56"]
 git = "https://github.com/mozilla/application-services"
-rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/mozilla/audioipc?rev=82fe7fa7e3aaa35468137239a0e4c2f867457214"]

Cargo.toml

@@ -71,13 +71,13 @@ rust-version = "1.90.0"
 
 [workspace.dependencies]
 # Shared across multiple UniFFI consumers.
-uniffi = "0.29.3"
-uniffi_bindgen = "0.29.3"
-uniffi_pipeline = "0.29.3"
+uniffi = "0.31"
+uniffi_bindgen = "0.31"
+uniffi_pipeline = "0.31"
 # Shared across multiple application-services consumers.
 rusqlite = "0.37"
 # Shared across multiple glean consumers.
-glean = "=66.3.0"
+glean = "=67.0.0"
 
 # Explicitly specify what our profiles use.  The opt-level setting here is
 # a total fiction; see the setup of MOZ_RUST_DEFAULT_FLAGS for what the
@@ -172,10 +172,6 @@ bindgen = { path = "build/rust/bindgen" }
 # Patch nix 0.29 to 0.30+
 nix = { path = "build/rust/nix" }
 
-# Patch siphasher 0.3 to 1.0
-# TODO: Remove once https://github.com/mozilla/uniffi-rs/pull/2709 lands in m-c.
-siphasher = { path = "build/rust/siphasher" }
-
 # Patch autocfg to hide rustc output. Workaround for https://github.com/cuviper/autocfg/issues/30
 autocfg = { path = "third_party/rust/autocfg" }
 
@@ -270,21 +266,21 @@ objc = { git = "https://github.com/glandium/rust-objc", rev = "4de89f5aa9851ceca
 allocator-api2 = { git = "https://github.com/glandium/allocator-api2", rev = "ad5f3d56a5a4519eff52af4ff85293431466ef5c" }
 
 # application-services overrides to make updating them all simpler.
-context_id = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-error-support = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-filter_adult = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-relevancy = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-search = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-sql-support = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-suggest = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-sync15 = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-tabs = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-tracing-support = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-webext-storage = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-logins = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-init_rust_components = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
+context_id = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+error-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+filter_adult = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+relevancy = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+search = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+sql-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+suggest = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+sync15 = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+tabs = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+tracing-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+viaduct = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+webext-storage = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+logins = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+init_rust_components = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
 # Patched version of zip 2.4.2 to allow for reading omnijars.
 zip = { path = "third_party/rust/zip" }
 

browser/components/aiwindow/ui/components/input-cta/input-cta.css

@@ -13,11 +13,12 @@
 
 moz-button.input-cta {
   --button-background-color-active: color-mix(in srgb, black 25%, transparent);
-  --button-background-color-disabled: var(--color-gray-20);
+  --button-background-color-disabled: light-dark(var(--color-gray-20), var(--color-gray-60));
   --button-background-color-hover: color-mix(in srgb, black 15%, transparent);
   --button-background-color-selected: color-mix(in srgb, black 25%, transparent);
   --button-background-color: transparent;
   --button-border-radius: var(--border-radius-circle);
+  --button-icon-fill: light-dark(var(--color-gray-60), white);
   --button-padding: 0 var(--space-small) 0 var(--space-large);
   --button-text-color-active: white;
   --button-text-color-disabled: white;

browser/components/aiwindow/ui/components/memories-icon-button/memories-icon-button.css

@@ -3,6 +3,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 moz-button.memories-icon-button {
-  --button-icon-fill: var(--color-gray-70);
+  --button-icon-fill: light-dark(var(--color-gray-70), white);
   --button-background-color-ghost-selected: transparent;
 }

browser/components/ipprotection/IPPNimbusHelper.sys.mjs

@@ -33,21 +33,22 @@ class IPPNimbusHelperSingleton {
   }
 
   /**
-   * Check if this device is in the experiment with a variant branch.
+   * Check that this device is not in the control branch of an experiment.
    *
    * @returns {boolean}
    */
   get isEligible() {
     let inExperiment = lazy.NimbusFeatures.ipProtection.getEnrollmentMetadata();
-    let isEligible = inExperiment?.branch && inExperiment.branch !== "control";
 
     if (inExperiment) {
       lazy.NimbusFeatures.ipProtection.recordExposureEvent({
         once: true,
       });
+
+      return inExperiment.branch !== "control";
     }
 
-    return isEligible;
+    return true;
   }
 }
 

browser/components/ipprotection/tests/browser/browser_IPPProxyManager.js

@@ -8,15 +8,13 @@ const { IPProtectionServerlist } = ChromeUtils.importESModule(
   "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs"
 );
 
-// Don't add an experiment so we can test adding and removing it.
-DEFAULT_EXPERIMENT = null;
-
 add_task(async function test_IPPProxyManager_handleProxyErrorEvent() {
   setupService({
     isSignedIn: true,
     canEnroll: true,
   });
-  let cleanupAlpha = await setupExperiment({ enabled: true, variant: "alpha" });
+
+  IPProtectionService.updateState();
 
   await IPProtectionServerlist.maybeFetchList();
 
@@ -115,7 +113,6 @@ add_task(async function test_IPPProxyManager_handleProxyErrorEvent() {
     "Should not return a promise when connection is inactive"
   );
 
-  await cleanupAlpha();
   cleanupService();
 });
 
@@ -128,6 +125,8 @@ add_task(async function test_IPPProxyManager_bug_1999946() {
     "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs"
   );
 
+  Services.prefs.clearUserPref("browser.ipProtection.enabled");
+
   // Hook the Call to create to capture the created channel filter
   let channelFilterRef = null;
   const sandbox = sinon.createSandbox();
@@ -145,7 +144,9 @@ add_task(async function test_IPPProxyManager_bug_1999946() {
     canEnroll: true,
   });
 
-  let cleanupAlpha = await setupExperiment({ enabled: true, variant: "alpha" });
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.ipProtection.enabled", true]],
+  });
 
   await IPProtectionServerlist.maybeFetchList();
 
@@ -158,6 +159,5 @@ add_task(async function test_IPPProxyManager_bug_1999946() {
   );
 
   sandbox.restore();
-  await cleanupAlpha();
   cleanupService();
 });