Upgrade from Chromium 133 to Chromium 134

android/brave_java_sources.gni

@@ -91,7 +91,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/brave_news/models/FeedItemsCard.java",
   "../../brave/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsUtil.java",
-  "../../brave/android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataFragmentAdvanced.java",
+  "../../brave/android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/compositor/layouts/BraveToolbarSwipeLayout.java",
   "../../brave/android/java/org/chromium/chrome/browser/contextmenu/BraveChromeContextMenuPopulator.java",
   "../../brave/android/java/org/chromium/chrome/browser/cosmetic_filters/BraveCosmeticFiltersUtils.java",
@@ -387,7 +387,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/settings/BraveWebrtcPolicyPreferencesFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/MediaPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/NetworkPreferenceAdapter.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/SearchPreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java",

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

@@ -15,6 +15,7 @@
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.Supplier;
+import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.hub.ResourceButtonData;
 import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthController;
 import org.chromium.chrome.browser.tabmodel.TabGroupModelFilter;
@@ -34,7 +35,8 @@ public BraveIncognitoTabSwitcherPane(
             @Nullable OneshotSupplier<IncognitoReauthController> incognitoReauthControllerSupplier,
             @NonNull DoubleConsumer onToolbarAlphaChange,
             @NonNull UserEducationHelper userEducationHelper,
-            @NonNull ObservableSupplier<EdgeToEdgeController> edgeToEdgeSupplier) {
+            @NonNull ObservableSupplier<EdgeToEdgeController> edgeToEdgeSupplier,
+            @NonNull ObservableSupplier<CompositorViewHolder> compositorViewHolderSupplier) {
         super(
                 context,
                 factory,
@@ -43,7 +45,8 @@ public BraveIncognitoTabSwitcherPane(
                 incognitoReauthControllerSupplier,
                 onToolbarAlphaChange,
                 userEducationHelper,
-                edgeToEdgeSupplier);
+                edgeToEdgeSupplier,
+                compositorViewHolderSupplier);
 
         ResourceButtonData newReferenceButtonData =
                 new ResourceButtonData(

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

@@ -25,7 +25,7 @@
 import org.chromium.chrome.browser.toolbar.bottom.BottomControlsCoordinator;
 import org.chromium.chrome.tab_ui.R;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
-import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator;
+import org.chromium.components.browser_ui.widget.scrim.ScrimManager;
 import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.widget.ChromeImageView;
 
@@ -40,7 +40,7 @@ public BraveTabGroupUiCoordinator(
             @NonNull Activity activity,
             @NonNull ViewGroup parentView,
             @NonNull BrowserControlsStateProvider browserControlsStateProvider,
-            @NonNull ScrimCoordinator scrimCoordinator,
+            @NonNull ScrimManager scrimManager,
             @NonNull ObservableSupplier<Boolean> omniboxFocusStateSupplier,
             @NonNull BottomSheetController bottomSheetController,
             @NonNull DataSharingTabManager dataSharingTabManager,
@@ -54,7 +54,7 @@ public BraveTabGroupUiCoordinator(
                 activity,
                 parentView,
                 browserControlsStateProvider,
-                scrimCoordinator,
+                scrimManager,
                 omniboxFocusStateSupplier,
                 bottomSheetController,
                 dataSharingTabManager,

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

@@ -10,6 +10,7 @@
 import androidx.annotation.NonNull;
 
 import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.hub.HubContainerView;
 import org.chromium.chrome.browser.hub.HubLayoutAnimatorProvider;
 import org.chromium.chrome.browser.tab.Tab;
@@ -26,21 +27,23 @@ public abstract class BraveTabSwitcherPaneBase extends TabSwitcherPaneBase {
             boolean isIncognito,
             @NonNull DoubleConsumer onToolbarAlphaChange,
             @NonNull UserEducationHelper userEducationHelper,
-            @NonNull ObservableSupplier<EdgeToEdgeController> edgeToEdgeSupplier) {
+            @NonNull ObservableSupplier<EdgeToEdgeController> edgeToEdgeSupplier,
+            @NonNull ObservableSupplier<CompositorViewHolder> compositorViewHolderSupplier) {
         super(
                 context,
                 factory,
                 isIncognito,
                 onToolbarAlphaChange,
                 userEducationHelper,
-                edgeToEdgeSupplier);
+                edgeToEdgeSupplier,
+                compositorViewHolderSupplier);
     }
 
     @Override
     public @NonNull HubLayoutAnimatorProvider createHideHubLayoutAnimatorProvider(
             @NonNull HubContainerView hubContainerView) {
-        int tabId = getCurrentTabId();
-        if (getTabListMode() != TabListMode.LIST && tabId != Tab.INVALID_TAB_ID) {
+        Tab tab = getCurrentTab();
+        if (getTabListMode() != TabListMode.LIST && tab != null) {
             // Force call TabSwitcherPaneBase.createTabSwitcherPaneCoordinator
             // to ensure TabSwitcherPaneBase.mTabSwitcherPaneCoordinatorSupplier is set
             super.createTabSwitcherPaneCoordinator();

android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- android_chrome_strings.grd contains strings for tab ui DFM of Brave for Android. -->
 <!--This file is created by l10nUtil.js. Do not edit manually.-->
-<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
+<grit current_release="1" latest_public_release="0">
   <outputs>
     <output filename="values-af/android_chrome_tab_ui_strings.xml" lang="af" type="android" />
     <output filename="values-am/android_chrome_tab_ui_strings.xml" lang="am" type="android" />
@@ -201,6 +201,9 @@
       <message name="IDS_TAB_GRID_MANAGE_BUTTON_TEXT" desc="Text for managing the sharing of the current tab group from the tab group dialog toolbar.">
         Manage
       </message>
+      <message name="IDS_MANAGE_SHARING_CONTENT_DESCRIPTION" desc="Content description for the account avatar button that manages sharing for a shared tab group.">
+        Manage sharing
+      </message>
 
       <!-- Bottom Tab Strip strings -->
       <message name="IDS_ACCESSIBILITY_BOTTOM_TAB_STRIP_EXPAND_TAB_SHEET" desc="Accessibility string for BottomTabStripToolbar button indicated visually by the '^' sign.">
@@ -212,6 +215,29 @@
         Tab Switcher
       </message>
 
+      <!-- Tab Group Share Notice Bottom Sheet -->
+      <message name="IDS_TAB_GROUP_SHARE_NOTICE_BOTTOM_SHEET_CONTENT_DESCRIPTION" desc="The description of the Tab Group Share Notice bottom sheet.">
+         Notice: Changes to this shared Tab Group are visible to everyone. Everyone can make changes to your shared tab groups
+      </message>
+      <message name="IDS_TAB_GROUP_SHARE_NOTICE_BOTTOM_SHEET_HALF_HEIGHT" desc="The announcement when the Tab Group Share Notice bottom sheet is opened to half height.">
+         Notice about Shared Tab Group changes at half height
+      </message>
+      <message name="IDS_TAB_GROUP_SHARE_NOTICE_BOTTOM_SHEET_FULL_HEIGHT" desc="The announcement when the Tab Group Share Notice bottom sheet is opened to full height.">
+         Notice about Shared Tab Group changes opened at full height
+      </message>
+      <message name="IDS_TAB_GROUP_SHARE_NOTICE_BOTTOM_SHEET_CLOSED" desc="The announcement when the Tab Group Share Notice bottom sheet is closed.">
+         Notice about Shared Tab Group changes closed
+      </message>
+      <message name="IDS_TAB_GROUP_SHARE_NOTICE_BOTTOM_SHEET_TITLE" desc="Title text for the Tab Group Share Notice bottom sheet.">
+         Everyone can make changes to your shared tab groups
+      </message>
+      <message name="IDS_TAB_GROUP_SHARE_NOTICE_BOTTOM_SHEET_SUBTITLE" desc="Subtitle text for the Tab Group Share Notice bottom sheet.">
+         Changes made are seen by everyone in the group
+      </message>
+      <message name="IDS_TAB_GROUP_SHARE_NOTICE_BOTTOM_SHEET_BUTTON_TEXT" desc="Text for the confirm button on the Tab Group Share Notice bottom sheet.">
+         Got it
+      </message>
+
       <!-- Tab Selection Editor strings -->
       <message name="IDS_TAB_SELECTION_EDITOR_TOOLBAR_SELECT_TABS" desc="Label shown on Tab Selection Editor Toolbar asking user to select tabs from the list.">
         Select tabs
@@ -718,17 +744,20 @@
       <message name="IDS_DELETE_TAB_GROUP_MENU_ITEM" desc="Menu item text which will prompt a confirmation dialog to delete a tab group.">
         Delete
       </message>
+      <message name="IDS_DELETE_SHARED_TAB_GROUP_DIALOG_TITLE" desc="Title of a dialog asking if the user really wants to delete a tab group that is shared with other users.">
+        Delete group?
+      </message>
       <message name="IDS_DELETE_SHARED_TAB_GROUP_DESCRIPTION" desc="Menu item text which will prompt a confirmation dialog to delete a tab group that is shared with other users.">
-        Everyone will immediately lose access to the <ph name="GROUP_NAME">%1$s<ex>Vacation</ex></ph> tab group, and it will be deleted from all devices
+        Everyone will immediately lose access to the "<ph name="GROUP_NAME">%1$s<ex>Vacation</ex></ph>" tab group, and it will be deleted from all devices
       </message>
       <message name="IDS_LEAVE_TAB_GROUP_MENU_ITEM" desc="Menu item text for an item which will leave a group the user does not own.">
         Leave
       </message>
       <message name="IDS_LEAVE_TAB_GROUP_DIALOG_TITLE" desc="Title of a dialog asking if the user really wants to leave a shared tab group.">
-        Leave tab group?
+        Leave group?
       </message>
       <message name="IDS_LEAVE_TAB_GROUP_DESCRIPTION" desc="Description of the action of leaving a shared tab group, shown in a confirmation dialog.">
-        You’ll immediately lose access to the <ph name="GROUP_NAME">%1$s<ex>Vacation</ex></ph> tab group
+        You’ll immediately lose access to the "<ph name="GROUP_NAME">%1$s<ex>Vacation</ex></ph>" tab group, and it will be deleted from all your devices
       </message>
       <message name="IDS_UNGROUP_TAB_GROUP_DIALOG_TITLE" desc="Title of a dialog asking if the user really wants to ungroup all tabs in a group.">
         Ungroup tab group?
@@ -784,17 +813,15 @@
         Close tab and delete group?
       </message>
       <message name="IDS_KEEP_TAB_GROUP_DIALOG_TITLE" desc="Title of a dialog asking the user if they want to keep the tab group.">
-        Keep tab group?
+        Keep group?
       </message>
       <message name="IDS_KEEP_TAB_GROUP_DIALOG_DESCRIPTION_OWNER" desc="Main text content of a dialog asking the owner of a shared group if they want to keep it. The &#10; is a newline character to force formatting.">
         Keep this group to add tabs later, or delete it if you no longer need it.
 
 If you delete it, everyone will immediately lose access to the "<ph name="TITLE_OF_GROUP">%1$s<ex>Shopping cart</ex></ph>" tab group, and it will be deleted from all devices.
       </message>
-      <message name="IDS_KEEP_TAB_GROUP_DIALOG_DESCRIPTION_MEMBER" desc="Main text content of a dialog asking a member of a shared group if they want to keep it or leave. The &#10; is a newline character to force formatting.">
-        Keep this group to add tabs later, or leave.
-
-If you leave, you will immediately lose access to the "<ph name="TITLE_OF_GROUP">%1$s<ex>Shopping cart</ex></ph>" tab group.
+      <message name="IDS_KEEP_TAB_GROUP_DIALOG_DESCRIPTION_MEMBER" desc="Main text content of a dialog asking a member of a shared group if they want to keep it or leave.">
+        Keep this group to add tabs later, or leave it if you no longer want access to it
       </message>
       <message name="IDS_KEEP_TAB_GROUP_DIALOG_KEEP_ACTION" desc="Action button to keep the tab group in the keep group dialog.">
         Keep group
@@ -865,6 +892,9 @@ If you leave, you will immediately lose access to the "<ph name="TITLE_OF_GROUP"
       <message name="IDS_TAB_GROUP_MENU_ACCESSIBILITY_TEXT" desc="Content description for accessibility to describe the action of tapping on the more menu button.">
         <ph name="TITLE_OF_GROUP">%s<ex>shopping</ex></ph> tab group options
       </message>
+      <message name="IDS_TAB_GROUP_SHARE_NOTIFICATION_BUBBLE_IPH" desc="IPH text highlighting notification bubble displayed on the tablet tab strip when a shared tab group receives updates from other members.">
+        Changes made are seen by everyone in the group
+      </message>
 
       <!-- Tabs Settings Strings -->
       <message name="IDS_TABS_SETTINGS_TITLE" desc="A title to show in the top toolbar when the Tabs settings page is open.">
@@ -953,6 +983,18 @@ If you leave, you will immediately lose access to the "<ph name="TITLE_OF_GROUP"
       <message name="IDS_ACCESSIBILITY_ARCHIVED_TABS_DIALOG" desc="Accessibility string for archived tabs dialog. This string is announced when the Tab Selection Editor is shown to screen.">
         Inactive tabs dialog
       </message>
+
+      <message name="IDS_SEND_FEEDBACK_TAB_GRID_DIALOG" desc="Button to send feedback on shared tab groups.">
+        Send feedback
+      </message>
+
+      <!-- Tab Group Removed Message Strings -->
+      <message name="IDS_TAB_GROUP_REMOVED_MESSAGE_CARD_DESCRIPTION" desc="Description text on the message card which is shown when user is no longer a part of the tab group. [CHAR_LIMIT=40]">
+        <ph name="TAB_GROUP_NAME">%1$s<ex>Vacation</ex></ph> tab group no longer available
+      </message>
+      <message name="IDS_ACCESSIBILITY_TAB_GROUP_REMOVED_DISMISS_BUTTON" desc="The accessibility text to read when the 'X' button on the tab removed message card is focused">
+        Dismiss the card.
+      </message>
     </messages>
   </release>
 </grit>

android/features/tab_ui/java/strings/android_chrome_tab_ui_strings_override.grd

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- android_chrome_strings.grd contains strings for tab ui DFM of Brave for Android. -->
-<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
+<grit current_release="1" latest_public_release="0">
   <translations>
     <file path="translations/android_chrome_tab_ui_strings_override_af.xtb" lang="af" />
     <file path="translations/android_chrome_tab_ui_strings_override_am.xtb" lang="am" />

android/java/apk_for_test.flags

@@ -136,7 +136,7 @@
     *** mFullscreenManager;
     *** mActivityTabProvider;
     *** mAppThemeColorProvider;
-    *** mScrimCoordinator;
+    *** mScrimManager;
     *** mMenuButtonCoordinator;
     *** mToolbarTabController;
     *** mLocationBar;

android/java/org/chromium/chrome/browser/autofill/BraveAutofillBackgroundServiceImpl.java

@@ -156,54 +156,57 @@ private void fillAddressAutoFill(Context context, Map<String, AutofillId> fields
 
                 Map<AutofillId, String> autofillDataMap = new HashMap<>();
                 addAutofillDataMap(
-                        fields, View.AUTOFILL_HINT_NAME, profile.getFullName(), autofillDataMap);
+                        fields,
+                        View.AUTOFILL_HINT_NAME,
+                        profile.getInfo(FieldType.NAME_FULL),
+                        autofillDataMap);
                 addAutofillDataMap(
                         fields,
                         View.AUTOFILL_HINT_EMAIL_ADDRESS,
-                        profile.getEmailAddress(),
+                        profile.getInfo(FieldType.EMAIL_ADDRESS),
                         autofillDataMap);
                 addAutofillDataMap(
                         fields,
                         View.AUTOFILL_HINT_PHONE,
-                        profile.getPhoneNumber().replaceAll("\\s", ""),
+                        profile.getInfo(FieldType.PHONE_HOME_WHOLE_NUMBER).replaceAll("\\s", ""),
                         autofillDataMap);
                 addAutofillDataMap(
                         fields,
                         View.AUTOFILL_HINT_POSTAL_ADDRESS,
-                        profile.getStreetAddress(),
+                        profile.getInfo(FieldType.ADDRESS_HOME_STREET_ADDRESS),
                         autofillDataMap);
                 addAutofillDataMap(
                         fields,
                         View.AUTOFILL_HINT_POSTAL_CODE,
-                        profile.getPostalCode(),
+                        profile.getInfo(FieldType.ADDRESS_HOME_ZIP),
                         autofillDataMap);
                 addAutofillDataMap(
                         fields,
                         context.getResources().getString(R.string.city),
-                        profile.getLocality(),
+                        profile.getInfo(FieldType.ADDRESS_HOME_CITY),
                         autofillDataMap);
                 addAutofillDataMap(
                         fields,
                         context.getResources().getString(R.string.state),
-                        profile.getRegion(),
+                        profile.getInfo(FieldType.ADDRESS_HOME_STATE),
                         autofillDataMap);
                 addAutofillDataMap(
                         fields,
                         context.getResources().getString(R.string.company),
-                        profile.getCompanyName(),
+                        profile.getInfo(FieldType.COMPANY_NAME),
                         autofillDataMap);
                 addAutofillDataMap(
                         fields,
                         context.getResources().getString(R.string.country),
-                        profile.getCountryCode(),
+                        profile.getInfo(FieldType.ADDRESS_HOME_COUNTRY),
                         autofillDataMap);
                 if (autofillDataMap != null && !autofillDataMap.isEmpty()) {
                     Dataset.Builder dataset = new Dataset.Builder();
                     for (Map.Entry<AutofillId, String> autofillData : autofillDataMap.entrySet()) {
                         String title = autofillData.getValue();
-                        String subtitle = profile.getStreetAddress();
+                        String subtitle = profile.getInfo(FieldType.ADDRESS_HOME_STREET_ADDRESS);
                         if (title.equals(subtitle)) {
-                            subtitle = profile.getFullName();
+                            subtitle = profile.getInfo(FieldType.NAME_FULL);
                         }
                         RemoteViews presentation =
                                 new RemoteViews(mPackageName, R.layout.brave_autofill_service_item);

android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataFragmentAdvanced.java → android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataFragment.java

@@ -23,7 +23,7 @@
 import org.chromium.ui.text.SpanApplier;
 import org.chromium.ui.text.SpanApplier.SpanInfo;
 
-public class BraveClearBrowsingDataFragmentAdvanced extends ClearBrowsingDataFragmentAdvanced {
+public class BraveClearBrowsingDataFragment extends ClearBrowsingDataFragment {
     ClearBrowsingDataCheckBoxPreference mClearAIChatDataCheckBoxPreference;
 
     @Override
@@ -106,6 +106,7 @@ private Callback<View> clearBraveAdsDataCallback() {
     @Override
     protected void onClearBrowsingData() {
         super.onClearBrowsingData();
+
         if (mClearAIChatDataCheckBoxPreference != null
                 && mClearAIChatDataCheckBoxPreference.isChecked()) {
             Profile profile = getProfile();