Conflict-resolved patches from Chromium 138.0.7204.25 to Chromium 139.0.7241.1.

Author: cdesouza-chromium

patches/chrome-browser-ui-views-frame-multi_contents_view.h.patch

@@ -1,11 +1,11 @@
 diff --git a/chrome/browser/ui/views/frame/multi_contents_view.h b/chrome/browser/ui/views/frame/multi_contents_view.h
-index f2f3673b77e8f2eb118a602601c644604dfef2ee..004a22f6ce635ab03e80ba9b42967eea09274044 100644
+index 7aa36d1033aeb2cc064526e229a9a67b80278609..80d6e79635111d3ecd0315375e47b7ab1d4d9e1a 100644
 --- a/chrome/browser/ui/views/frame/multi_contents_view.h
 +++ b/chrome/browser/ui/views/frame/multi_contents_view.h
-@@ -18,7 +18,7 @@
- 
+@@ -19,7 +19,7 @@
  class BrowserView;
  class ContentsWebView;
+ class MultiContentsDropTargetView;
 -class MultiContentsResizeArea;
 +// class MultiContentsResizeArea;
  class MultiContentsViewDelegate;

patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch

@@ -1,16 +1,16 @@
 diff --git a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
-index 53e8ce89fb5a7c5a6310e05c9ad046d19db7b80f..3a86e388995a137b0e6e8a556b19833dfb345b7e 100644
+index a0e56db759429f155e7367e185c475b3b4c53d0b..7a1f2770c15a4af29c87180c0312bd5e18371b6b 100644
 --- a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
 +++ b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
-@@ -689,6 +689,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
-   registry->RegisterUint64Pref(kVariationsLimitedEntropySyntheticTrialSeed, 0);
-   registry->RegisterUint64Pref(kVariationsLimitedEntropySyntheticTrialSeedV2,
-                                0);
+@@ -682,6 +682,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
+   // Deprecated 06/2025.
+   registry->RegisterBooleanPref(
+       prefs::kIosCredentialProviderPromoHasRegisteredWithPromoManager, false);
 +  BRAVE_REGISTER_LOCAL_STATE_PREFS
  }
 
  void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-@@ -1107,6 +1108,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -1087,6 +1088,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterTimePref(kSyncLastSyncedTime, base::Time());
    registry->RegisterTimePref(kSyncLastPollTime, base::Time());
    registry->RegisterTimeDeltaPref(kSyncPollInterval, base::TimeDelta());

patches/third_party-lit-v3_0-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/third_party/lit/v3_0/BUILD.gn b/third_party/lit/v3_0/BUILD.gn
-index 14e9d8bffdd6a2feec0b2881f9349ad2a07732d1..db6baa6f45fcffa82e4186be84ef0460bab3fa63 100644
+index abc50e655d1d872b0b6d4685b7f0cfbdbfd56cdc..06faf70d459287991cf8697302b6d8924a5b5ae7 100644
 --- a/third_party/lit/v3_0/BUILD.gn
 +++ b/third_party/lit/v3_0/BUILD.gn
 @@ -121,6 +121,7 @@ ts_library("build_ts") {
@@ -16,5 +16,5 @@ index 14e9d8bffdd6a2feec0b2881f9349ad2a07732d1..db6baa6f45fcffa82e4186be84ef0460
    ]
 +  import("//brave/third_party/lit/v3_0/sources.gni") visibility += brave_lit_build_ts_visibility
  }
- 
+
  bundle_js("build_bundle") {