Upgrade from Chromium 107 to Chromium 108 (Uplift to 1.46.x).

.gitignore

@@ -19,6 +19,7 @@ patches/**/*.patchinfo
 /third_party/argon2/src
 /third_party/ethash/src
 /third_party/bitcoin-core/src
+/third_party/rapidjson/src
 /third_party/rust/cxx
 *.xcodeproj
 *.swp

.storybook/BUILD.gn

@@ -20,7 +20,6 @@ group("storybook") {
     "//mojo/public/js:bindings",
     "//mojo/public/js:resources",
     "//ui/webui/resources/js:cr.m",
-    "//ui/webui/resources/js:modulize",
     "//ui/webui/resources/js:preprocess",
   ]
 }

DEPS

@@ -14,7 +14,6 @@ deps = {
     "url": "https://github.com/brave/Sparkle.git@f69ba7b7fae7dda475ba6cda12fba8d72270478d",
     "condition": "checkout_mac",
   },
-  "vendor/bat-native-rapidjson": "https://github.com/brave-intl/bat-native-rapidjson.git@60b7e4574cebdd79f441bdd6f0f3ab469fd7e04c",
   "vendor/bip39wally-core-native": "https://github.com/brave-intl/bat-native-bip39wally-core.git@0d3a8713a2b388d2156fe49a70ef3f7cdb44b190",
   "vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@800f9d40b7409239ff192e0be634764e747c7a75",
   "vendor/challenge_bypass_ristretto_ffi": "https://github.com/brave-intl/challenge-bypass-ristretto-ffi.git@419995e4a873c294f1eaefca276f8ad25328e89f",
@@ -23,6 +22,7 @@ deps = {
   "third_party/ethash/src": "https://github.com/chfast/ethash.git@e4a15c3d76dc09392c7efd3e30d84ee3b871e9ce",
   "third_party/bitcoin-core/src": "https://github.com/bitcoin/bitcoin.git@95ea54ba089610019a74c1176a2c7c0dba144b1c",
   "third_party/argon2/src": "https://github.com/P-H-C/phc-winner-argon2.git@62358ba2123abd17fccf2a108a301d4b52c01a7c",
+  "third_party/rapidjson/src": "https://github.com/Tencent/rapidjson.git@06d58b9e848c650114556a23294d0b6440078c61",
 }
 
 recursedeps = [

android/android_browser_tests.gni

@@ -155,6 +155,7 @@ android_only_test_sources = [
 
 android_only_test_deps = [
   ":test_support",
+  "//android_webview/common",
   "//brave/browser/partnerbookmarks:delegate_public_impl_java",
   "//brave/browser/partnercustomizations:delegate_public_impl_java",
   "//chrome:chrome_android_core",

android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java

@@ -17,7 +17,6 @@
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.feed.hooks.FeedHooks;
 import org.chromium.chrome.browser.feed.sections.SectionHeaderView;
 import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher;

android/java/apk_for_test.flags

@@ -128,7 +128,7 @@
     *** mActionModeController;
     *** mLocationBarModel;
     *** mToolbar;
-    *** mBookmarkBridgeSupplier;
+    *** mBookmarkModelSupplier;
     *** mLayoutManager;
     *** mOverlayPanelVisibilitySupplier;
     *** mTabModelSelector;

android/java/org/chromium/chrome/browser/BraveDialogFragment.java

@@ -7,7 +7,6 @@
 
 package org.chromium.chrome.browser;
 
-import android.content.DialogInterface;
 import android.content.res.Configuration;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
@@ -29,24 +28,15 @@ public void onConfigurationChanged(Configuration newConfig) {
     @Override
     public void onResume() {
         super.onResume();
-        getDialog().setOnKeyListener(new DialogInterface.OnKeyListener() {
-            @Override
-            public boolean onKey(android.content.DialogInterface dialog, int keyCode,
-                    android.view.KeyEvent event) {
-                if ((keyCode == android.view.KeyEvent.KEYCODE_BACK)) {
-                    dismiss();
-                    return true;
-                } else
-                    return false;
-            }
-        });
+
+        getDialog().setCanceledOnTouchOutside(false);
+
         setDialogParams();
     }
 
     private void setDialogParams() {
         DisplayMetrics displayMetrics = new DisplayMetrics();
         getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        int mDeviceHeight = displayMetrics.heightPixels;
         int mDeviceWidth = displayMetrics.widthPixels;
 
         WindowManager.LayoutParams params = getDialog().getWindow().getAttributes();

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -1087,7 +1087,6 @@ public void setDormantUsersPrefs() {
     private void showVpnCalloutDialog() {
         BraveVpnCalloutDialogFragment braveVpnCalloutDialogFragment =
                 new BraveVpnCalloutDialogFragment();
-        braveVpnCalloutDialogFragment.setCancelable(false);
         braveVpnCalloutDialogFragment.show(
                 getSupportFragmentManager(), "BraveVpnCalloutDialogFragment");
     }
@@ -1106,7 +1105,6 @@ private void showAdFreeCalloutDialog() {
 
         BraveAdFreeCalloutDialogFragment braveAdFreeCalloutDialogFragment =
                 new BraveAdFreeCalloutDialogFragment();
-        braveAdFreeCalloutDialogFragment.setCancelable(false);
         braveAdFreeCalloutDialogFragment.show(
                 getSupportFragmentManager(), "BraveAdFreeCalloutDialogFragment");
     }
@@ -1541,13 +1539,12 @@ private void clearObservers() {
 
     private void showBraveRateDialog() {
         RateDialogFragment mRateDialogFragment = new RateDialogFragment();
-        mRateDialogFragment.setCancelable(false);
         mRateDialogFragment.show(getSupportFragmentManager(), "RateDialogFragment");
     }
 
     private void showCrossPromotionalDialog() {
-        CrossPromotionalModalDialogFragment mCrossPromotionalModalDialogFragment = new CrossPromotionalModalDialogFragment();
-        mCrossPromotionalModalDialogFragment.setCancelable(false);
+        CrossPromotionalModalDialogFragment mCrossPromotionalModalDialogFragment =
+                new CrossPromotionalModalDialogFragment();
         mCrossPromotionalModalDialogFragment.show(getSupportFragmentManager(), "CrossPromotionalModalDialogFragment");
     }
 
@@ -1556,7 +1553,6 @@ public void showDormantUsersEngagementDialog(String notificationType) {
                 && !BraveSetDefaultBrowserUtils.isBraveDefaultDontAsk()) {
             DormantUsersEngagementDialogFragment dormantUsersEngagementDialogFragment =
                     new DormantUsersEngagementDialogFragment();
-            dormantUsersEngagementDialogFragment.setCancelable(false);
             dormantUsersEngagementDialogFragment.setNotificationType(notificationType);
             dormantUsersEngagementDialogFragment.show(
                     getSupportFragmentManager(), "DormantUsersEngagementDialogFragment");

android/java/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java

@@ -17,11 +17,12 @@
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
+import org.chromium.chrome.browser.bookmarks.BookmarkModel;
 import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
+import org.chromium.components.bookmarks.BookmarkItem;
 
 /**
  * A {@link LinearLayout} that displays a horizontal row of icons for page actions.
@@ -71,12 +72,12 @@ protected void onFinishInflate() {
     /**
      * Initializes the icons, setting enabled state, drawables, and content descriptions.
      * @param appMenuHandler The {@link AppMenu} that contains the icon row.
-     * @param bookmarkBridge The {@link BookmarkBridge} used to retrieve information about
+     * @param bookmarkBridge The {@link BookmarkModel} used to retrieve information about
      *                       bookmarks.
      * @param currentTab The current activity {@link Tab}.
      * @param appMenuDelegate The AppMenuDelegate to handle options item selection.
      */
-    public void initialize(AppMenuHandler appMenuHandler, BookmarkBridge bookmarkBridge,
+    public void initialize(AppMenuHandler appMenuHandler, BookmarkModel bookmarkBridge,
             Tab currentTab, AppMenuDelegate appMenuDelegate) {
         mAppMenuHandler = appMenuHandler;
         mAppMenuDelegate = appMenuDelegate;
@@ -109,7 +110,7 @@ public void loadingStateChanged(boolean isLoading) {
                         : getContext().getString(R.string.accessibility_btn_refresh));
     }
 
-    private void updateBookmarkMenuItem(BookmarkBridge bookmarkBridge, Tab currentTab) {
+    private void updateBookmarkMenuItem(BookmarkModel bookmarkBridge, Tab currentTab) {
         mBookmarkButton.setEnabled(bookmarkBridge.isEditBookmarksEnabled());
 
         if (bookmarkBridge.hasBookmarkIdForTab(currentTab)) {

android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java

@@ -17,7 +17,7 @@
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
-import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
+import org.chromium.chrome.browser.bookmarks.BookmarkModel;
 import org.chromium.chrome.browser.feed.webfeed.WebFeedBridge;
 import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthController;
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
@@ -39,7 +39,7 @@ public BraveAppMenuPropertiesDelegateImpl(Context context,
             TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView,
             @Nullable OneshotSupplier<LayoutStateProvider> layoutStateProvidersSupplier,
             @Nullable OneshotSupplier<StartSurface> startSurfaceSupplier,
-            ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
+            ObservableSupplier<BookmarkModel> bookmarkBridgeSupplier,
             @Nullable OneshotSupplier<IncognitoReauthController>
                     incognitoReauthControllerOneshotSupplier) {
         super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,

android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java

@@ -23,7 +23,7 @@
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.BraveConfig;
 import org.chromium.chrome.browser.app.appmenu.AppMenuIconRowFooter;
-import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
+import org.chromium.chrome.browser.bookmarks.BookmarkModel;
 import org.chromium.chrome.browser.feed.webfeed.WebFeedBridge;
 import org.chromium.chrome.browser.feed.webfeed.WebFeedSnackbarController;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -50,7 +50,7 @@
 public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertiesDelegate {
     private Menu mMenu;
     private AppMenuDelegate mAppMenuDelegate;
-    private ObservableSupplier<BookmarkBridge> mBookmarkBridgeSupplier;
+    private ObservableSupplier<BookmarkModel> mBookmarkModelSupplier;
 
     public BraveTabbedAppMenuPropertiesDelegate(Context context,
             ActivityTabProvider activityTabProvider,
@@ -59,7 +59,7 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context,
             AppMenuDelegate appMenuDelegate,
             OneshotSupplier<LayoutStateProvider> layoutStateProvider,
             OneshotSupplier<StartSurface> startSurfaceSupplier,
-            ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
+            ObservableSupplier<BookmarkModel> bookmarkBridgeSupplier,
             WebFeedSnackbarController.FeedLauncher feedLauncher,
             ModalDialogManager modalDialogManager, SnackbarManager snackbarManager,
             @NonNull OneshotSupplier<IncognitoReauthController>
@@ -70,7 +70,7 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context,
                 snackbarManager, incognitoReauthControllerOneshotSupplier);
 
         mAppMenuDelegate = appMenuDelegate;
-        mBookmarkBridgeSupplier = bookmarkBridgeSupplier;
+        mBookmarkModelSupplier = bookmarkBridgeSupplier;
     }
 
     @Override
@@ -188,7 +188,7 @@ public void onMenuDismissed() {
     @Override
     public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
         // If it's still null, just hide the whole view
-        if (mBookmarkBridgeSupplier.get() == null) {
+        if (mBookmarkModelSupplier.get() == null) {
             if (view != null) {
                 view.setVisibility(View.GONE);
             }
@@ -200,7 +200,7 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
 
         if (view instanceof AppMenuIconRowFooter) {
             ((AppMenuIconRowFooter) view)
-                    .initialize(appMenuHandler, mBookmarkBridgeSupplier.get(),
+                    .initialize(appMenuHandler, mBookmarkModelSupplier.get(),
                             mActivityTabProvider.get(), mAppMenuDelegate);
         }
 

android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java

@@ -15,7 +15,6 @@
 import org.chromium.base.Log;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
-import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
 import org.chromium.chrome.browser.flags.CachedFeatureFlags;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -24,6 +23,7 @@
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
 import org.chromium.components.bookmarks.BookmarkId;
+import org.chromium.components.bookmarks.BookmarkItem;
 import org.chromium.components.bookmarks.BookmarkType;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 

android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java

@@ -14,7 +14,6 @@
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
 import org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator;
 import org.chromium.chrome.browser.feed.FeedFeatures;

android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java

@@ -24,6 +24,7 @@
 import org.chromium.chrome.browser.omnibox.LocationBarMediator.SaveOfflineButtonState;
 import org.chromium.chrome.browser.omnibox.status.StatusCoordinator.PageInfoAction;
 import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener;
 import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
 import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -62,7 +63,9 @@ public BraveLocationBarCoordinator(View locationBarLayout, View autocompleteAnch
             @NonNull OmniboxPedalDelegate omniboxPedalDelegate,
             BrowserStateBrowserControlsVisibilityDelegate browserControlsVisibilityDelegate,
             Callback<Throwable> reportExceptionCallback,
-            @Nullable BackPressManager backPressManager) {
+            @Nullable BackPressManager backPressManager,
+            @NonNull OmniboxSuggestionsDropdownScrollListener
+                    omniboxSuggestionsDropdownScrollListener) {
         super(locationBarLayout, autocompleteAnchorView, profileObservableSupplier,
                 privacyPreferencesManager, locationBarDataProvider, actionModeCallback,
                 windowDelegate, windowAndroid, activityTabSupplier, modalDialogManagerSupplier,
@@ -72,7 +75,7 @@ public BraveLocationBarCoordinator(View locationBarLayout, View autocompleteAnch
                 saveOfflineButtonState, omniboxUma, tabWindowManagerSupplier, bookmarkState,
                 isToolbarMicEnabledSupplier, jankTracker, merchantTrustSignalsCoordinatorSupplier,
                 omniboxPedalDelegate, browserControlsVisibilityDelegate, reportExceptionCallback,
-                backPressManager);
+                backPressManager, omniboxSuggestionsDropdownScrollListener);
 
         if (mLocationBarMediator instanceof BraveLocationBarMediator) {
             mQRButton = locationBarLayout.findViewById(R.id.qr_button);

android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java

@@ -47,8 +47,6 @@ public class RateDialogFragment extends BraveDialogFragment implements View.OnCl
     private EditText mRateFeedbackEditText;
     private Button mPositiveButton;
     private Button mNegativeButton;
-    private Button mRateButton;
-    private Button mLaterButton;
 
     private LinearLayout mSmileyLayout;
     private LinearLayout mRateActionLayout;
@@ -63,7 +61,8 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_rate_dialog, container, false);
     }
 
@@ -110,7 +109,9 @@ public void onClick(View view) {
                     mRateFeedbackEditText.startAnimation(shake);
                     return;
                 } else {
-                    RateFeedbackUtils.RateFeedbackWorkerTask mWorkerTask = new RateFeedbackUtils.RateFeedbackWorkerTask(mUserSelection, feedback, rateFeedbackCallback);
+                    RateFeedbackUtils.RateFeedbackWorkerTask mWorkerTask =
+                            new RateFeedbackUtils.RateFeedbackWorkerTask(
+                                    mUserSelection, feedback, rateFeedbackCallback);
                     mWorkerTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                 }
             } else if (mIsSuccessShown) {
@@ -134,7 +135,9 @@ private void openPlaystore() {
         try {
             getActivity().startActivity(new Intent(Intent.ACTION_VIEW, marketUri));
         } catch (android.content.ActivityNotFoundException ex) {
-            Toast.makeText(getActivity(), "Couldn't find PlayStore on this device", Toast.LENGTH_SHORT).show();
+            Toast.makeText(getActivity(), "Couldn't find PlayStore on this device",
+                         Toast.LENGTH_SHORT)
+                    .show();
         }
         RateUtils.getInstance(getActivity()).setNextRateDateAndCount();
         dismiss();
@@ -164,14 +167,16 @@ private void showRateSuccess() {
         mPositiveButton.setText(getResources().getString(R.string.rate));
         mNegativeButton.setText(getResources().getString(R.string.later));
 
-        mRateTitleTextView.setText(getResources().getString(R.string.would_you_mind_leaving_rating));
+        mRateTitleTextView.setText(
+                getResources().getString(R.string.would_you_mind_leaving_rating));
     }
 
-    private RateFeedbackUtils.RateFeedbackCallback rateFeedbackCallback = new RateFeedbackUtils.RateFeedbackCallback() {
-        @Override
-        public void rateFeedbackSubmitted() {
-            RateUtils.getInstance(getActivity()).setNextRateDateAndCount();
-            dismiss();
-        }
-    };
+    private RateFeedbackUtils.RateFeedbackCallback rateFeedbackCallback =
+            new RateFeedbackUtils.RateFeedbackCallback() {
+                @Override
+                public void rateFeedbackSubmitted() {
+                    RateUtils.getInstance(getActivity()).setNextRateDateAndCount();
+                    dismiss();
+                }
+            };
 }

android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java

@@ -364,7 +364,6 @@ public boolean onPreferenceClick(Preference preference) {
                 bundle.putBoolean(RateUtils.FROM_SETTINGS, true);
 
                 RateDialogFragment mRateDialogFragment = new RateDialogFragment();
-                mRateDialogFragment.setCancelable(false);
                 mRateDialogFragment.setArguments(bundle);
                 mRateDialogFragment.show(getParentFragmentManager(), "RateDialogFragment");
                 return true;