Merge pull request #6042 from brave/cr85

Upgrade from Chromium 84 to Chromium 85
brave · Aug 7, 2020 · 58d7380 · 58d7380
2 parents 718fc34 + e88322f
commit 58d7380
Show file tree

Hide file tree

Showing 434 changed files with 3,464 additions and 1,918 deletions.
diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
@@ -122,6 +122,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java",
+  "../../brave/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java",

diff --git a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java
@@ -14,6 +14,7 @@
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.supplier.Supplier;
+import org.chromium.chrome.browser.feed.action.FeedActionHandler;
 import org.chromium.chrome.browser.feed.library.api.host.action.ActionApi;
 import org.chromium.chrome.browser.feed.shared.FeedSurfaceDelegate;
 import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate;
@@ -24,6 +25,7 @@
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.feed.R;
+import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.ui.UiUtils;
 
 public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator {
@@ -35,12 +37,13 @@ public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator {
     public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarManager,
             TabModelSelector tabModelSelector, Supplier<Tab> tabProvider,
             @Nullable SnapScrollHelper snapScrollHelper, @Nullable View ntpHeader,
-            @Nullable SectionHeaderView sectionHeaderView, ActionApi actionApi,
+            @Nullable SectionHeaderView sectionHeaderView, FeedActionHandler.Options actionOptions,
             boolean showDarkBackground, FeedSurfaceDelegate delegate,
-            @Nullable NativePageNavigationDelegate pageNavigationDelegate, Profile profile) {
+            @Nullable NativePageNavigationDelegate pageNavigationDelegate, Profile profile,
+            boolean isPlaceholderShown, BottomSheetController bottomSheetController) {
         super(activity, snackbarManager, tabModelSelector, tabProvider, snapScrollHelper, ntpHeader,
-                sectionHeaderView, actionApi, showDarkBackground, delegate, pageNavigationDelegate,
-                profile);
+                sectionHeaderView, actionOptions, showDarkBackground, delegate,
+                pageNavigationDelegate, profile, isPlaceholderShown, bottomSheetController);
     }
 
     @Override

diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
@@ -8,7 +8,7 @@
 # needed for checking of existence for bytecode manipulation
 -keepnames class org.chromium.chrome.browser.settings.MainSettings
 
--keep class org.chromium.components.sync.AndroidSyncSettings {
+-keep class org.chromium.chrome.browser.sync.AndroidSyncSettings {
     *** notifyObservers(...);
     *** updateCachedSettings(...);
     *** setChromeSyncEnabled(...);

diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java
@@ -1085,7 +1085,7 @@ private void HideNotifications() {
     @Override
     public void OnWalletInitialized(int error_code) {
         if (BraveRewardsNativeWorker.WALLET_CREATED == error_code) {
-            BraveAdsNativeHelper.nativeSetAdsEnabled(Profile.getLastUsedProfile());
+            BraveAdsNativeHelper.nativeSetAdsEnabled(Profile.getLastUsedRegularProfile());
             ShowWebSiteView(false);
         } else if (BraveRewardsNativeWorker.SAFETYNET_ATTESTATION_FAILED == error_code) {
             dismiss();

diff --git a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
@@ -37,13 +37,18 @@ private void CompleteUpholdVerification(ExternalNavigationParams params) {
         mBraveUphold.CompleteUpholdVerification(params, this);
     }
 
-    /**
-     * This function will be removed by ASM byte-code patching tool
-     * and redirected to ExternalNavigationHandler.
-     */
     public @OverrideUrlLoadingResult int clobberCurrentTabWithFallbackUrl(
         String browserFallbackUrl, ExternalNavigationParams params) {
-        assert false;
-        return OverrideUrlLoadingResult.OVERRIDE_WITH_CLOBBERING_TAB;
+        // Below is an actual code that was used prior to deletion of
+        // clobberCurrentTabWithFallbackUrl introduced here
+        // https://chromium.googlesource.com/chromium/src/+/37b5b744bc83f630d3121b46868818bb4e848c2a
+        if (!params.isMainFrame()) {
+            return OverrideUrlLoadingResult.NO_OVERRIDE;
+        }
+
+        if (params.getRedirectHandler() != null) {
+            params.getRedirectHandler().setShouldNotOverrideUrlLoadingOnCurrentRedirectChain();
+        }
+        return clobberCurrentTab(browserFallbackUrl, params.getReferrerUrl());
     }
 }
diff --git a/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java
@@ -32,7 +32,7 @@ public void onCreatePreferences(@Nullable Bundle savedInstanceState, String root
         SettingsUtils.addPreferencesFromResource(this, R.xml.brave_theme_preferences);
         getActivity().setTitle(getResources().getString(R.string.theme_settings));
 
-        Profile mProfile = Profile.getLastUsedProfile();
+        Profile mProfile = Profile.getLastUsedRegularProfile();
         NTPBackgroundImagesBridge mNTPBackgroundImagesBridge = NTPBackgroundImagesBridge.getInstance(mProfile);
         if (!NTPBackgroundImagesBridge.enableSponsoredImages()
                 || (mNTPBackgroundImagesBridge != null

diff --git a/.../org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java b/.../org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java
@@ -18,12 +18,13 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.v4.app.NotificationCompat;
+
+import androidx.core.app.NotificationCompat;
 
 import org.chromium.base.ContextUtils;
-import org.chromium.chrome.R;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
+import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveActivity;
 import org.chromium.components.embedder_support.util.UrlConstants;
 

diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java
@@ -10,17 +10,18 @@
 import androidx.annotation.Nullable;
 
 import org.chromium.base.supplier.Supplier;
+import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator;
 import org.chromium.chrome.browser.feed.FeedProcessScopeFactory;
 import org.chromium.chrome.browser.feed.shared.FeedSurfaceProvider;
-import org.chromium.chrome.browser.fullscreen.BrowserControlsStateProvider;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.native_page.NativePageHost;
+import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 
 public class BraveNewTabPage extends NewTabPage {
     private NewTabPageLayout mNewTabPageLayout;
@@ -31,10 +32,11 @@ public BraveNewTabPage(Activity activity,
             Supplier<Tab> activityTabProvider, @Nullable OverviewModeBehavior overviewModeBehavior,
             SnackbarManager snackbarManager, ActivityLifecycleDispatcher lifecycleDispatcher,
             TabModelSelector tabModelSelector, boolean isTablet, NewTabPageUma uma,
-            boolean isInNightMode, NativePageHost nativePageHost, Tab tab) {
+            boolean isInNightMode, NativePageHost nativePageHost, Tab tab,
+            BottomSheetController bottomSheetController) {
         super(activity, browserControlsStateProvider, activityTabProvider, overviewModeBehavior,
                 snackbarManager, lifecycleDispatcher, tabModelSelector, isTablet, uma,
-                isInNightMode, nativePageHost, tab);
+                isInNightMode, nativePageHost, tab, bottomSheetController);
 
         assert mNewTabPageLayout instanceof BraveNewTabPageLayout;
         if (mNewTabPageLayout instanceof BraveNewTabPageLayout) {
@@ -45,17 +47,17 @@ public BraveNewTabPage(Activity activity,
     @Override
     protected void initializeMainView(Activity activity, Supplier<Tab> tabProvider,
             SnackbarManager snackbarManager, TabModelSelector tabModelSelector, NewTabPageUma uma,
-            boolean isInNightMode) {
-        super.initializeMainView(
-                activity, tabProvider, snackbarManager, tabModelSelector, uma, isInNightMode);
+            boolean isInNightMode, BottomSheetController bottomSheetController) {
+        super.initializeMainView(activity, tabProvider, snackbarManager, tabModelSelector, uma,
+                isInNightMode, bottomSheetController);
         // Override surface provider
         Profile profile = Profile.fromWebContents(mTab.getWebContents());
 
         assert !FeedProcessScopeFactory.isFeedProcessEnabled();
-        mFeedSurfaceProvider =
-                new BraveFeedSurfaceCoordinator(activity, snackbarManager, tabModelSelector,
-                        tabProvider, new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout),
-                        mNewTabPageLayout, null, null, isInNightMode, this,
-                        mNewTabPageManager.getNavigationDelegate(), profile);
+        mFeedSurfaceProvider = new BraveFeedSurfaceCoordinator(activity, snackbarManager,
+                tabModelSelector, tabProvider,
+                new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout), mNewTabPageLayout,
+                null, null, isInNightMode, this, mNewTabPageManager.getNavigationDelegate(),
+                profile, false, bottomSheetController);
     }
 }
diff --git a/...a/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java b/...a/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java
@@ -206,7 +206,7 @@ private void turnOnRewards() {
     }
 
     private void turnOnAds() {
-        BraveAdsNativeHelper.nativeSetAdsEnabled(Profile.getLastUsedProfile());
+        BraveAdsNativeHelper.nativeSetAdsEnabled(Profile.getLastUsedRegularProfile());
     }
 
     private void reloadTab() {

diff --git a/...a/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java b/...a/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java
@@ -54,7 +54,7 @@ public static SuperReferralShareDialogFragment newInstance(String title) {
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
-        Profile mProfile = Profile.getLastUsedProfile();
+        Profile mProfile = Profile.getLastUsedRegularProfile();
         mNTPBackgroundImagesBridge = NTPBackgroundImagesBridge.getInstance(mProfile);
 		return inflater.inflate(R.layout.fragment_super_referral_share, container);
 	}

diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPUtil.java b/android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPUtil.java
@@ -72,7 +72,7 @@ public class NTPUtil {
         new HashMap<String, SoftReference<Bitmap>>();
 
     public static void turnOnAds() {
-        BraveAdsNativeHelper.nativeSetAdsEnabled(Profile.getLastUsedProfile());
+        BraveAdsNativeHelper.nativeSetAdsEnabled(Profile.getLastUsedRegularProfile());
     }
 
     public static void updateOrientedUI(Context context, ViewGroup view) {
@@ -151,11 +151,11 @@ public static int checkForNonDistruptiveBanner(NTPImage ntpImage, SponsoredTab s
 
         if (sponsoredTab.shouldShowBanner()) {
             if (BravePrefServiceBridge.getInstance().getBoolean(BravePref.BRAVE_REWARDS_ENABLED)) {
-                if (BraveAdsNativeHelper.nativeIsBraveAdsEnabled(Profile.getLastUsedProfile())) {
+                if (BraveAdsNativeHelper.nativeIsBraveAdsEnabled(Profile.getLastUsedRegularProfile())) {
                     if (ntpImage instanceof Wallpaper) {
                         return SponsoredImageUtil.BR_ON_ADS_ON;
                     }
-                } else if (BraveAdsNativeHelper.nativeIsLocaleValid(Profile.getLastUsedProfile())) {
+                } else if (BraveAdsNativeHelper.nativeIsLocaleValid(Profile.getLastUsedRegularProfile())) {
                     if (ntpImage instanceof Wallpaper) {
                         return SponsoredImageUtil.BR_ON_ADS_OFF ;
                     } else {
@@ -451,7 +451,7 @@ public static NTPImage getNTPImage(NTPBackgroundImagesBridge mNTPBackgroundImage
     }
 
     public static boolean isReferralEnabled() {
-        Profile mProfile = Profile.getLastUsedProfile();
+        Profile mProfile = Profile.getLastUsedRegularProfile();
         NTPBackgroundImagesBridge mNTPBackgroundImagesBridge = NTPBackgroundImagesBridge.getInstance(mProfile);
         boolean isReferralEnabled = BravePrefServiceBridge.getInstance().getInteger(BravePref.NTP_SHOW_SUPER_REFERRAL_THEMES_OPTION) == 1 ? true : false;
         return mNTPBackgroundImagesBridge.isSuperReferral() && isReferralEnabled;

diff --git a/.../chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java b/.../chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java
@@ -13,20 +13,24 @@
 import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
 import org.chromium.chrome.browser.omnibox.suggestions.UrlBarDelegate;
 import org.chromium.chrome.browser.omnibox.suggestions.basic.SuggestionHost;
+import org.chromium.chrome.browser.share.ShareDelegate;
+import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.ui.favicon.LargeIconBridge;
 
 public class BraveEditUrlSuggestionProcessor extends EditUrlSuggestionProcessor {
     private boolean mHasClearedOmniboxForFocus;
 
     public BraveEditUrlSuggestionProcessor(Context context, SuggestionHost suggestionHost,
-            UrlBarDelegate locationBarDelegate, Supplier<LargeIconBridge> iconBridgeSupplier) {
-        super(context, suggestionHost, locationBarDelegate, iconBridgeSupplier);
+            UrlBarDelegate locationBarDelegate, Supplier<LargeIconBridge> iconBridgeSupplier,
+            Supplier<Tab> tabSupplier, Supplier<ShareDelegate> shareDelegateSupplier) {
+        super(context, suggestionHost, locationBarDelegate, iconBridgeSupplier, tabSupplier,
+                shareDelegateSupplier);
     }
 
     @Override
-    public boolean doesProcessSuggestion(OmniboxSuggestion suggestion) {
+    public boolean doesProcessSuggestion(OmniboxSuggestion suggestion, int position) {
         // We don't want to clear omnibox for focus, so just pretend that it's already happened
         mHasClearedOmniboxForFocus = true;
-        return super.doesProcessSuggestion(suggestion);
+        return super.doesProcessSuggestion(suggestion, position);
     }
 }
diff --git a/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsService.java b/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsService.java
@@ -68,7 +68,7 @@ public void OnWalletInitialized(int error_code) {
         if (BraveRewardsNativeWorker.WALLET_CREATED == error_code
                 && OnboardingPrefManager.getInstance().isAdsAvailable()) {
             // Enable ads
-            BraveAdsNativeHelper.nativeSetAdsEnabled(Profile.getLastUsedProfile());
+            BraveAdsNativeHelper.nativeSetAdsEnabled(Profile.getLastUsedRegularProfile());
         } else {
             // TODO: handle wallet creation problem
         }

diff --git a/android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java b/android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java
@@ -177,13 +177,13 @@ public void setOnboardingShownForSkip(boolean isShown) {
     public boolean showOnboardingForSkip() {
         boolean shouldShow = !hasOnboardingShownForSkip()
                              && (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS) && !BravePrefServiceBridge.getInstance().getBoolean(BravePref.BRAVE_REWARDS_ENABLED))
-                             && !BraveAdsNativeHelper.nativeIsBraveAdsEnabled(Profile.getLastUsedProfile())
+                             && !BraveAdsNativeHelper.nativeIsBraveAdsEnabled(Profile.getLastUsedRegularProfile())
                              && (getNextOnboardingDate() > 0 && System.currentTimeMillis() > getNextOnboardingDate());
         return shouldShow;
     }
 
     public boolean isAdsAvailable() {
-        return BraveAdsNativeHelper.nativeIsSupportedLocale(Profile.getLastUsedProfile());
+        return BraveAdsNativeHelper.nativeIsSupportedLocale(Profile.getLastUsedRegularProfile());
     }
 
     public void showOnboarding(Context context) {

diff --git a/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java b/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java
@@ -127,31 +127,31 @@ public boolean GetBooleanForContentSetting(int content_type) {
     * @param preference The name of the preference.
     * @return Whether the specified preference is enabled.
     */
-    public boolean getBoolean(@Pref int preference) {
+    public boolean getBoolean(int preference) {
         return BravePrefServiceBridgeJni.get().getBoolean(preference);
     }
 
     /**
      * @param preference The name of the preference.
      * @param value The value the specified preference will be set to.
      */
-    public void setBoolean(@Pref int preference, boolean value) {
+    public void setBoolean(int preference, boolean value) {
         BravePrefServiceBridgeJni.get().setBoolean(preference, value);
     }
 
     /**
      * @param preference The name of the preference.
      * @return value The value of the specified preference.
      */
-    public int getInteger(@Pref int preference) {
+    public int getInteger(int preference) {
         return BravePrefServiceBridgeJni.get().getInteger(preference);
     }
 
     /**
      * @param preference The name of the preference.
      * @param value The value the specified preference will be set to.
      */
-    public void setInteger(@Pref int preference, int value) {
+    public void setInteger(int preference, int value) {
         BravePrefServiceBridgeJni.get().setInteger(preference, value);
     }
 
@@ -160,15 +160,15 @@ public void setInteger(@Pref int preference, int value) {
      * @return value The value of the specified preference.
      */
     @NonNull
-    public String getString(@Pref int preference) {
+    public String getString(int preference) {
         return BravePrefServiceBridgeJni.get().getString(preference);
     }
 
     /**
      * @param preference The name of the preference.
      * @param value The value the specified preference will be set to.
      */
-    public void setString(@Pref int preference, @NonNull String value) {
+    public void setString(int preference, @NonNull String value) {
         BravePrefServiceBridgeJni.get().setString(preference, value);
     }
 

diff --git a/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java b/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java
@@ -67,7 +67,7 @@ private static void sendRateFeedback(String userSelection, String userFeedback)
 		String appVersion = AboutChromeSettings.getApplicationVersion(context, AboutSettingsBridge.getApplicationVersion());
 		StringBuilder sb = new StringBuilder();
 
-		Profile mProfile = Profile.getLastUsedProfile();
+		Profile mProfile = Profile.getLastUsedRegularProfile();
 		NTPBackgroundImagesBridge mNTPBackgroundImagesBridge = NTPBackgroundImagesBridge.getInstance(mProfile);
 
 		HttpURLConnection urlConnection = null;

diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java
@@ -22,7 +22,6 @@
 import android.hardware.Camera;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
 import android.text.Editable;
 import android.text.SpannableString;
 import android.text.TextUtils;
@@ -53,6 +52,7 @@
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.app.ActivityCompat;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;

diff --git a/...um/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java b/...um/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java
@@ -28,7 +28,7 @@ public class BraveRadioButtonGroupCustomHomepageThemePreference extends RadioBut
 
     public BraveRadioButtonGroupCustomHomepageThemePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        Profile mProfile = Profile.getLastUsedProfile();
+        Profile mProfile = Profile.getLastUsedRegularProfile();
         mNTPBackgroundImagesBridge = NTPBackgroundImagesBridge.getInstance(mProfile);
     }
 

diff --git a/android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java b/android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java
@@ -58,7 +58,7 @@ private static void sendBraveShieldsFeedback(String domain) {
 		Context context = ContextUtils.getApplicationContext();
 		StringBuilder sb = new StringBuilder();
 
-		Profile mProfile = Profile.getLastUsedProfile();
+		Profile mProfile = Profile.getLastUsedRegularProfile();
 		NTPBackgroundImagesBridge mNTPBackgroundImagesBridge = NTPBackgroundImagesBridge.getInstance(mProfile);
 
 		HttpURLConnection urlConnection = null;

diff --git a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java
@@ -7,10 +7,10 @@
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
+import org.chromium.chrome.browser.sync.AndroidSyncSettings;
 import org.chromium.components.signin.AccountTrackerService;
 import org.chromium.components.signin.identitymanager.IdentityManager;
 import org.chromium.components.signin.identitymanager.IdentityMutator;
-import org.chromium.components.sync.AndroidSyncSettings;
 
 public class BraveSigninManager extends SigninManager {
     BraveSigninManager(long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService,