Upgrade from Chromium 132 to Chromium 133 (1.75.x)

PRESUBMIT.py

@@ -358,15 +358,6 @@ def CheckNewSourceFileWithoutGnChangeOnUpload(input_api, output_api):
         treat_as_error=True,
         excluded_paths=[_THIRD_PARTY_EXCEPT_BLINK],
     ),
-    BanRule(
-        'NOTREACHED_IN_MIGRATION',
-        ('Do not introduce new cases of of NOTREACHED_IN_MIGRATION. Please ',
-         'refer to the guide for how to use CHECK/DCHECK/NOTREACHED ',
-         'https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/checks.md.'
-         ),
-        treat_as_error=True,
-        excluded_paths=[],
-    ),
 )
 
 

android/brave_java_resources.gni

@@ -57,7 +57,7 @@ brave_java_resources = [
   "java/res/drawable-hdpi/location_bar_incognito_badge.png",
   "java/res/drawable-hdpi/modern_location_bar.9.png",
   "java/res/drawable-hdpi/naver.png",
-  "java/res/drawable-hdpi/omnibox_https_valid.png",
+  "java/res/drawable-hdpi/omnibox_https_valid_lock.png",
   "java/res/drawable-hdpi/plus.png",
   "java/res/drawable-hdpi/search_engine_bing.png",
   "java/res/drawable-hdpi/search_engine_brave.png",
@@ -113,7 +113,7 @@ brave_java_resources = [
   "java/res/drawable-mdpi/location_bar_incognito_badge.png",
   "java/res/drawable-mdpi/modern_location_bar.9.png",
   "java/res/drawable-mdpi/naver.png",
-  "java/res/drawable-mdpi/omnibox_https_valid.png",
+  "java/res/drawable-mdpi/omnibox_https_valid_lock.png",
   "java/res/drawable-mdpi/plus.png",
   "java/res/drawable-mdpi/search_engine_bing.png",
   "java/res/drawable-mdpi/search_engine_brave.png",
@@ -191,7 +191,7 @@ brave_java_resources = [
   "java/res/drawable-xhdpi/location_bar_incognito_badge.png",
   "java/res/drawable-xhdpi/modern_location_bar.9.png",
   "java/res/drawable-xhdpi/naver.png",
-  "java/res/drawable-xhdpi/omnibox_https_valid.png",
+  "java/res/drawable-xhdpi/omnibox_https_valid_lock.png",
   "java/res/drawable-xhdpi/plus.png",
   "java/res/drawable-xhdpi/search_engine_bing.png",
   "java/res/drawable-xhdpi/search_engine_brave.png",
@@ -246,7 +246,7 @@ brave_java_resources = [
   "java/res/drawable-xxhdpi/location_bar_incognito_badge.png",
   "java/res/drawable-xxhdpi/modern_location_bar.9.png",
   "java/res/drawable-xxhdpi/naver.png",
-  "java/res/drawable-xxhdpi/omnibox_https_valid.png",
+  "java/res/drawable-xxhdpi/omnibox_https_valid_lock.png",
   "java/res/drawable-xxhdpi/plus.png",
   "java/res/drawable-xxhdpi/search_engine_bing.png",
   "java/res/drawable-xxhdpi/search_engine_brave.png",
@@ -299,7 +299,7 @@ brave_java_resources = [
   "java/res/drawable-xxxhdpi/incognito_simple.png",
   "java/res/drawable-xxxhdpi/location_bar_incognito_badge.png",
   "java/res/drawable-xxxhdpi/naver.png",
-  "java/res/drawable-xxxhdpi/omnibox_https_valid.png",
+  "java/res/drawable-xxxhdpi/omnibox_https_valid_lock.png",
   "java/res/drawable-xxxhdpi/plus.png",
   "java/res/drawable-xxxhdpi/search_engine_brave.png",
   "java/res/drawable-xxxhdpi/search_engine_startpage.png",
@@ -374,7 +374,6 @@ brave_java_resources = [
   "java/res/drawable/brave_sync_top_rounded.xml",
   "java/res/drawable/brave_sync_top_rounded_light.xml",
   "java/res/drawable/card_bg.xml",
-  "java/res/drawable/checked_circle_filled.xml",
   "java/res/drawable/circular_progress.xml",
   "java/res/drawable/country_spinner_background.xml",
   "java/res/drawable/create_custom_filter_edit_bg.xml",
@@ -1045,7 +1044,10 @@ brave_download_internal_java_resources =
     [ "java/res/drawable-night/downloads_empty_state_illustration.xml" ]
 
 brave_android_features_java_resources = [
-  "java/res/drawable-night/phone_tab_switcher_empty_state_illustration.xml",
+  "java/res/drawable-night/phone_tab_switcher_empty_state_illustration_bottom_window.xml",
+  "java/res/drawable-night/phone_tab_switcher_empty_state_illustration_cloud_left.xml",
+  "java/res/drawable-night/phone_tab_switcher_empty_state_illustration_cloud_right.xml",
+  "java/res/drawable-night/phone_tab_switcher_empty_state_illustration_top_window.xml",
   "java/res/drawable-night/tablet_tab_switcher_empty_state_illustration.xml",
 ]
 

android/features/tab_ui/BUILD.gn

@@ -17,7 +17,7 @@ android_library("java") {
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/browser_controls/android:java",
     "//chrome/browser/commerce/merchant_viewer/android:java",
-    "//chrome/browser/data_sharing:tab_group_ui_java",
+    "//chrome/browser/data_sharing:data_sharing_public_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/profiles/android:java",

android/features/tab_ui/java/res/drawable-night/phone_tab_switcher_empty_state_illustration_bottom_window.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2025 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="96"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M38.24,33.2L64.24,33.2A2.8,2.8 0,0 1,67.04 36L67.04,70A2.8,2.8 0,0 1,64.24 72.8L38.24,72.8A2.8,2.8 0,0 1,35.44 70L35.44,36A2.8,2.8 0,0 1,38.24 33.2z"
+      android:strokeWidth="1.6"
+      android:fillColor="#00000000"
+      android:strokeColor="#7C91FF"/>
+  <path
+      android:pathData="M38.08,32.971C36.666,32.971 35.52,34.117 35.52,35.531V38.091H66.88V35.531C66.88,34.117 65.734,32.971 64.32,32.971H38.08Z"
+      android:fillColor="#7C91FF"
+      android:fillType="evenOdd"/>
+</vector>

android/features/tab_ui/java/res/drawable-night/phone_tab_switcher_empty_state_illustration_cloud_left.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2023 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="96"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M48,0L48,0A48,48 0,0 1,96 48L96,48A48,48 0,0 1,48 96L48,96A48,48 0,0 1,0 48L0,48A48,48 0,0 1,48 0z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="47.63"
+          android:startY="-15.63"
+          android:endX="48.613"
+          android:endY="152.939"
+          android:type="linear">
+        <item android:offset="0" android:color="#002A2ADE"/>
+        <item android:offset="1" android:color="#3F2A2ADE"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>

android/features/tab_ui/java/res/drawable-night/phone_tab_switcher_empty_state_illustration_cloud_right.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2023 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="96"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M48,0L48,0A48,48 0,0 1,96 48L96,48A48,48 0,0 1,48 96L48,96A48,48 0,0 1,0 48L0,48A48,48 0,0 1,48 0z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="47.63"
+          android:startY="-15.63"
+          android:endX="48.613"
+          android:endY="152.939"
+          android:type="linear">
+        <item android:offset="0" android:color="#002A2ADE"/>
+        <item android:offset="1" android:color="#3F2A2ADE"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>

android/features/tab_ui/java/res/drawable-night/phone_tab_switcher_empty_state_illustration.xml → android/features/tab_ui/java/res/drawable-night/phone_tab_switcher_empty_state_illustration_top_window.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2023 The Brave Authors. All rights reserved.
+<!-- Copyright (c) 2025 The Brave Authors. All rights reserved.
      This Source Code Form is subject to the terms of the Mozilla Public
      License, v. 2.0. If a copy of the MPL was not distributed with this file,
      You can obtain one at https://mozilla.org/MPL/2.0/.
@@ -11,37 +11,13 @@
     android:height="96dp"
     android:viewportWidth="96"
     android:viewportHeight="96">
-  <path
-      android:pathData="M48,0L48,0A48,48 0,0 1,96 48L96,48A48,48 0,0 1,48 96L48,96A48,48 0,0 1,0 48L0,48A48,48 0,0 1,48 0z">
-    <aapt:attr name="android:fillColor">
-      <gradient 
-          android:startX="47.63"
-          android:startY="-15.63"
-          android:endX="48.613"
-          android:endY="152.939"
-          android:type="linear">
-        <item android:offset="0" android:color="#002A2ADE"/>
-        <item android:offset="1" android:color="#3F2A2ADE"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:pathData="M38.24,33.2L64.24,33.2A2.8,2.8 0,0 1,67.04 36L67.04,70A2.8,2.8 0,0 1,64.24 72.8L38.24,72.8A2.8,2.8 0,0 1,35.44 70L35.44,36A2.8,2.8 0,0 1,38.24 33.2z"
-      android:strokeWidth="1.6"
-      android:fillColor="#00000000"
-      android:strokeColor="#7C91FF"/>
   <path
       android:pathData="M31.76,23.84L57.76,23.84A2.8,2.8 0,0 1,60.56 26.64L60.56,62.64A2.8,2.8 0,0 1,57.76 65.44L31.76,65.44A2.8,2.8 0,0 1,28.96 62.64L28.96,26.64A2.8,2.8 0,0 1,31.76 23.84z"
       android:strokeWidth="1.6"
       android:fillColor="#00000000"
       android:strokeColor="#7C91FF"/>
-  <path
-      android:pathData="M38.08,32.971C36.666,32.971 35.52,34.117 35.52,35.531V38.091H66.88V35.531C66.88,34.117 65.734,32.971 64.32,32.971H38.08Z"
-      android:fillColor="#7C91FF"
-      android:fillType="evenOdd"/>
   <path
       android:pathData="M29.12,26.56C29.12,25.146 30.266,24 31.68,24H57.92C59.334,24 60.48,25.146 60.48,26.56V29.12H29.12V26.56ZM32.96,25.28H31.68C31.51,25.28 31.347,25.347 31.228,25.468C31.107,25.587 31.04,25.75 31.04,25.92V27.2C31.04,27.37 31.107,27.533 31.228,27.653C31.347,27.773 31.51,27.84 31.68,27.84H32.96C33.13,27.84 33.293,27.773 33.412,27.653C33.533,27.533 33.6,27.37 33.6,27.2V25.92C33.6,25.75 33.533,25.587 33.412,25.468C33.293,25.347 33.13,25.28 32.96,25.28Z"
       android:fillColor="#7C91FF"
       android:fillType="evenOdd"/>
 </vector>
-

android/features/tab_ui/java/res/drawable/phone_tab_switcher_empty_state_illustration_bottom_window.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2025 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="96"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M38.24,33.2L64.24,33.2A2.8,2.8 0,0 1,67.04 36L67.04,70A2.8,2.8 0,0 1,64.24 72.8L38.24,72.8A2.8,2.8 0,0 1,35.44 70L35.44,36A2.8,2.8 0,0 1,38.24 33.2z"
+      android:strokeWidth="1.6"
+      android:fillColor="#00000000"
+      android:strokeColor="#545FF8"/>
+  <path
+      android:pathData="M38.08,32.971C36.666,32.971 35.52,34.117 35.52,35.531V38.091H66.88V35.531C66.88,34.117 65.734,32.971 64.32,32.971H38.08Z"
+      android:fillColor="#545FF8"
+      android:fillType="evenOdd"/>
+</vector>

android/features/tab_ui/java/res/drawable/phone_tab_switcher_empty_state_illustration_cloud_left.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2023 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="96"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M48,0L48,0A48,48 0,0 1,96 48L96,48A48,48 0,0 1,48 96L48,96A48,48 0,0 1,0 48L0,48A48,48 0,0 1,48 0z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="47.63"
+          android:startY="-15.63"
+          android:endX="48.613"
+          android:endY="152.939"
+          android:type="linear">
+        <item android:offset="0" android:color="#002A2ADE"/>
+        <item android:offset="1" android:color="#3F2A2ADE"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>

android/features/tab_ui/java/res/drawable/phone_tab_switcher_empty_state_illustration_cloud_right.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2023 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="96"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M48,0L48,0A48,48 0,0 1,96 48L96,48A48,48 0,0 1,48 96L48,96A48,48 0,0 1,0 48L0,48A48,48 0,0 1,48 0z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="47.63"
+          android:startY="-15.63"
+          android:endX="48.613"
+          android:endY="152.939"
+          android:type="linear">
+        <item android:offset="0" android:color="#002A2ADE"/>
+        <item android:offset="1" android:color="#3F2A2ADE"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>

android/features/tab_ui/java/res/drawable/phone_tab_switcher_empty_state_illustration.xml → android/features/tab_ui/java/res/drawable/phone_tab_switcher_empty_state_illustration_top_window.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2023 The Brave Authors. All rights reserved.
+<!-- Copyright (c) 2025 The Brave Authors. All rights reserved.
      This Source Code Form is subject to the terms of the Mozilla Public
      License, v. 2.0. If a copy of the MPL was not distributed with this file,
      You can obtain one at https://mozilla.org/MPL/2.0/.
@@ -11,34 +11,11 @@
     android:height="96dp"
     android:viewportWidth="96"
     android:viewportHeight="96">
-  <path
-      android:pathData="M48,0L48,0A48,48 0,0 1,96 48L96,48A48,48 0,0 1,48 96L48,96A48,48 0,0 1,0 48L0,48A48,48 0,0 1,48 0z">
-    <aapt:attr name="android:fillColor">
-      <gradient 
-          android:startX="47.63"
-          android:startY="-15.63"
-          android:endX="48.613"
-          android:endY="152.939"
-          android:type="linear">
-        <item android:offset="0" android:color="#002A2ADE"/>
-        <item android:offset="1" android:color="#3F2A2ADE"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:pathData="M38.24,33.2L64.24,33.2A2.8,2.8 0,0 1,67.04 36L67.04,70A2.8,2.8 0,0 1,64.24 72.8L38.24,72.8A2.8,2.8 0,0 1,35.44 70L35.44,36A2.8,2.8 0,0 1,38.24 33.2z"
-      android:strokeWidth="1.6"
-      android:fillColor="#00000000"
-      android:strokeColor="#545FF8"/>
   <path
       android:pathData="M31.76,23.84L57.76,23.84A2.8,2.8 0,0 1,60.56 26.64L60.56,62.64A2.8,2.8 0,0 1,57.76 65.44L31.76,65.44A2.8,2.8 0,0 1,28.96 62.64L28.96,26.64A2.8,2.8 0,0 1,31.76 23.84z"
       android:strokeWidth="1.6"
       android:fillColor="#00000000"
       android:strokeColor="#545FF8"/>
-  <path
-      android:pathData="M38.08,32.971C36.666,32.971 35.52,34.117 35.52,35.531V38.091H66.88V35.531C66.88,34.117 65.734,32.971 64.32,32.971H38.08Z"
-      android:fillColor="#545FF8"
-      android:fillType="evenOdd"/>
   <path
       android:pathData="M29.12,26.56C29.12,25.146 30.266,24 31.68,24H57.92C59.334,24 60.48,25.146 60.48,26.56V29.12H29.12V26.56ZM32.96,25.28H31.68C31.51,25.28 31.347,25.347 31.228,25.468C31.107,25.587 31.04,25.75 31.04,25.92V27.2C31.04,27.37 31.107,27.533 31.228,27.653C31.347,27.773 31.51,27.84 31.68,27.84H32.96C33.13,27.84 33.293,27.773 33.412,27.653C33.533,27.533 33.6,27.37 33.6,27.2V25.92C33.6,25.75 33.533,25.587 33.412,25.468C33.293,25.347 33.13,25.28 32.96,25.28Z"
       android:fillColor="#545FF8"

android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveIncognitoTabSwitcherPane.java

@@ -17,7 +17,6 @@
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.browser.hub.ResourceButtonData;
 import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthController;
-import org.chromium.chrome.browser.profiles.ProfileProvider;
 import org.chromium.chrome.browser.tabmodel.TabGroupModelFilter;
 import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
 import org.chromium.chrome.browser.user_education.UserEducationHelper;
@@ -29,19 +28,17 @@ public class BraveIncognitoTabSwitcherPane extends IncognitoTabSwitcherPane {
 
     public BraveIncognitoTabSwitcherPane(
             @NonNull Context context,
-            @NonNull OneshotSupplier<ProfileProvider> profileProviderSupplier,
             @NonNull TabSwitcherPaneCoordinatorFactory factory,
-            @NonNull Supplier<TabGroupModelFilter> incognitoTabModelFilterSupplier,
+            @NonNull Supplier<TabGroupModelFilter> incognitoTabGroupModelFilterSupplier,
             @NonNull OnClickListener newTabButtonClickListener,
             @Nullable OneshotSupplier<IncognitoReauthController> incognitoReauthControllerSupplier,
             @NonNull DoubleConsumer onToolbarAlphaChange,
             @NonNull UserEducationHelper userEducationHelper,
             @NonNull ObservableSupplier<EdgeToEdgeController> edgeToEdgeSupplier) {
         super(
                 context,
-                profileProviderSupplier,
                 factory,
-                incognitoTabModelFilterSupplier,
+                incognitoTabGroupModelFilterSupplier,
                 newTabButtonClickListener,
                 incognitoReauthControllerSupplier,
                 onToolbarAlphaChange,

android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabSwitcherPaneBase.java

@@ -10,10 +10,8 @@
 import androidx.annotation.NonNull;
 
 import org.chromium.base.supplier.ObservableSupplier;
-import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.chrome.browser.hub.HubContainerView;
 import org.chromium.chrome.browser.hub.HubLayoutAnimatorProvider;
-import org.chromium.chrome.browser.profiles.ProfileProvider;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tasks.tab_management.TabListCoordinator.TabListMode;
 import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
@@ -24,15 +22,13 @@
 public abstract class BraveTabSwitcherPaneBase extends TabSwitcherPaneBase {
     BraveTabSwitcherPaneBase(
             @NonNull Context context,
-            @NonNull OneshotSupplier<ProfileProvider> profileProviderSupplier,
             @NonNull TabSwitcherPaneCoordinatorFactory factory,
             boolean isIncognito,
             @NonNull DoubleConsumer onToolbarAlphaChange,
             @NonNull UserEducationHelper userEducationHelper,
             @NonNull ObservableSupplier<EdgeToEdgeController> edgeToEdgeSupplier) {
         super(
                 context,
-                profileProviderSupplier,
                 factory,
                 isIncognito,
                 onToolbarAlphaChange,