Upgrade from Chromium 98.0.4758.87 to Chromium 98.0.4758.102 (uplift to 1.35.x).

android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java

@@ -145,7 +145,7 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont
             ObservableSupplier<Boolean> omniboxFocusStateSupplier,
             OneshotSupplier<ToolbarIntentMetadata> intentMetadataOneshotSupplier,
             OneshotSupplier<Boolean> promoShownOneshotSupplier, WindowAndroid windowAndroid,
-            Supplier<Boolean> isInOverviewModeSupplier, boolean shouldShowOverviewPageOnStart,
+            Supplier<Boolean> isInOverviewModeSupplier,
             Supplier<ModalDialogManager> modalDialogManagerSupplier,
             StatusBarColorController statusBarColorController, AppMenuDelegate appMenuDelegate,
             ActivityLifecycleDispatcher activityLifecycleDispatcher,
@@ -168,12 +168,13 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont
                 layoutStateProviderSupplier, appMenuCoordinatorSupplier, shouldShowUpdateBadge,
                 tabModelSelectorSupplier, startSurfaceSupplier, omniboxFocusStateSupplier,
                 intentMetadataOneshotSupplier, promoShownOneshotSupplier, windowAndroid,
-                isInOverviewModeSupplier, shouldShowOverviewPageOnStart, modalDialogManagerSupplier,
-                statusBarColorController, appMenuDelegate, activityLifecycleDispatcher,
-                startSurfaceParentTabSupplier, bottomSheetController, isWarmOnResumeSupplier,
-                tabContentManager, tabCreatorManager, overviewModeBehaviorSupplier, snackbarManager,
-                jankTracker, merchantTrustSignalsCoordinatorSupplier,
-                tabReparentingControllerSupplier, initializeWithIncognitoColors);
+                isInOverviewModeSupplier, modalDialogManagerSupplier, statusBarColorController,
+                appMenuDelegate, activityLifecycleDispatcher, startSurfaceParentTabSupplier,
+                bottomSheetController, isWarmOnResumeSupplier, tabContentManager, tabCreatorManager,
+                overviewModeBehaviorSupplier, snackbarManager, jankTracker,
+
+                merchantTrustSignalsCoordinatorSupplier, tabReparentingControllerSupplier,
+                initializeWithIncognitoColors);
         mOmniboxFocusStateSupplier = omniboxFocusStateSupplier;
         mLayoutStateProviderSupplier = layoutStateProviderSupplier;
         mActivity = activity;

android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java

@@ -62,7 +62,7 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
             boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled,
             boolean isTabGroupsAndroidContinuationEnabled, HistoryDelegate historyDelegate,
             BooleanSupplier partnerHomepageEnabledSupplier, OfflineDownloader offlineDownloader,
-            boolean initializeWithIncognitoColors, boolean shouldHideToolbarLayoutOnStart) {
+            boolean initializeWithIncognitoColors) {
         super(controlContainer, toolbarLayout, toolbarDataProvider, tabController,
                 userEducationHelper, buttonDataProviders, layoutStateProviderSupplier,
                 normalThemeColorProvider, overviewThemeColorProvider,
@@ -74,8 +74,7 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
                 isIncognitoModeEnabledSupplier, isGridTabSwitcherEnabled,
                 isTabToGtsAnimationEnabled, isStartSurfaceEnabled,
                 isTabGroupsAndroidContinuationEnabled, historyDelegate,
-                partnerHomepageEnabledSupplier, offlineDownloader, initializeWithIncognitoColors,
-                shouldHideToolbarLayoutOnStart);
+                partnerHomepageEnabledSupplier, offlineDownloader, initializeWithIncognitoColors);
 
         mBraveToolbarLayout = toolbarLayout;
         mBraveMenuButtonCoordinator = browsingModeMenuButtonCoordinator;

android/javatests/org/chromium/chrome/browser/BytecodeTest.java

@@ -434,8 +434,8 @@ public void testConstructorsExistAndMatch() throws Exception {
                 ObservableSupplier.class, Supplier.class, OneshotSupplier.class,
                 OneshotSupplier.class, boolean.class, ObservableSupplier.class,
                 OneshotSupplier.class, ObservableSupplier.class, OneshotSupplier.class,
-                OneshotSupplier.class, WindowAndroid.class, Supplier.class, boolean.class,
-                Supplier.class, StatusBarColorController.class, AppMenuDelegate.class,
+                OneshotSupplier.class, WindowAndroid.class, Supplier.class, Supplier.class,
+                StatusBarColorController.class, AppMenuDelegate.class,
                 ActivityLifecycleDispatcher.class, Supplier.class, BottomSheetController.class,
                 Supplier.class, TabContentManager.class, TabCreatorManager.class,
                 OneshotSupplier.class, SnackbarManager.class, JankTracker.class, Supplier.class,
@@ -501,7 +501,7 @@ public void testConstructorsExistAndMatch() throws Exception {
                 ObservableSupplier.class, ObservableSupplier.class, Callback.class, Supplier.class,
                 Supplier.class, ObservableSupplier.class, BooleanSupplier.class, boolean.class,
                 boolean.class, boolean.class, boolean.class, HistoryDelegate.class,
-                BooleanSupplier.class, OfflineDownloader.class, boolean.class, boolean.class));
+                BooleanSupplier.class, OfflineDownloader.class, boolean.class));
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator",
                 "org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator",

package.json

@@ -256,7 +256,7 @@
     "projects": {
       "chrome": {
         "dir": "src",
-        "tag": "98.0.4758.87",
+        "tag": "98.0.4758.102",
         "repository": {
           "url": "https://github.com/chromium/chromium"
         }

patches/chrome-VERSION.patch

@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 10277375c3f0007f920f01dac0fc9bb4104a0424..11819ffbb240ed54f502aca136ce62a7b86fe48b 100644
+index 685e985ab01e54a4aaa24c3c40ced2a410edff67..1cdf82245187c540c37c3ad901ee9d307157492e 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=98
 -MINOR=0
 -BUILD=4758
--PATCH=87
+-PATCH=102
 +MINOR=1
 +BUILD=35
 +PATCH=101

patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-index 2225d8871767ed71034b79bf7ae5c8b3d5412b32..f4f05d2c3cc585cc0cd520997181141edb3b28c1 100644
+index 74d51e42b685dc5a3ff91f25fa7e025c795f5599..724ee35dab6eb53a36255d7d2d2307e32bdc12d2 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 @@ -2396,6 +2396,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent

patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-index ad9c1556872b8fbc6cbc9ffdc7dd1bbff709e0a0..4e0b5660bb5b5ded9179d54e565ba2c3fea0bf1d 100644
+index f64c33dbc1798a1e2eeb2eb45575772667e7bf66..aa46ecf37c59bc9967dbea128f718267bf05963b 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -395,7 +395,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -396,7 +396,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      private SubscriptionsManager mSubscriptionsManager;
 
      protected ChromeActivity() {

patches/chrome-installer-mac-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn
-index a2d2713e1961ecfa321b7d6b34d4f32dc619e3c7..d3170a9a4d8bf79e41e7fc466f516f0852a7c6ea 100644
+index 4fe91b44c0f5d820c17803ce49893959d98975ff..2b9012320e4f08c9a850c396b912b124ef295bc4 100644
 --- a/chrome/installer/mac/BUILD.gn
 +++ b/chrome/installer/mac/BUILD.gn
 @@ -18,7 +18,8 @@ group("mac") {

patches/chrome-test-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index cf07780786f235b567b754f4f91a4d716bd86778..1624dc503cf16e6280d6a522fd6db2bb0e8f2244 100644
+index 19387561ba18f2f9bf3a6ef42fc32b9adc7ac375..2ea7b2a6954d5de586d4f78576e891fd10e4f14e 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -310,6 +310,7 @@ static_library("test_support") {

patches/services-network-cors-cors_url_loader.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc
-index d68c3330290f28457a2231accbaaae72a0ee7ac2..3624742a3b4779951870b2e2a84fbf6968060ff5 100644
+index 24ccdad1609553aed93731186e878b69304019a6..975ef366fd0c97c23d3c1f9048d8683797b19c76 100644
 --- a/services/network/cors/cors_url_loader.cc
 +++ b/services/network/cors/cors_url_loader.cc
-@@ -656,6 +656,7 @@ void CorsURLLoader::StartRequest() {
+@@ -666,6 +666,7 @@ void CorsURLLoader::StartRequest() {
        (fetch_cors_flag_ ||
         (request_.method != net::HttpRequestHeaders::kGetMethod &&
          request_.method != net::HttpRequestHeaders::kHeadMethod))) {