Merge pull request #5102 from brave/cr83

Upgrade from Chromium 81 to Chromium 83
brave · Jun 4, 2020 · 87b5c37 · 87b5c37
1 parent 12f4a41
commit 87b5c37
Show file tree

Hide file tree

Showing 710 changed files with 8,959 additions and 6,857 deletions.
diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
@@ -38,8 +38,11 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkWorker.java",
   "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java",
-  "../../brave/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java",
   "../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedback.java",
+  "../../brave/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java",
+  "../../brave/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java",
+  "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationManagerProxyImpl.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java",
@@ -83,6 +86,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveSyncScreensObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettingsObserver.java",
+  "../../brave/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java",
@@ -106,21 +110,17 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
+  "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.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/BraveSyncService.java",
   "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncServiceObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java",

diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
@@ -23,10 +23,14 @@
     *** createBookmarkItem(...);
 }
 
--keep class org.chromium.chrome.browser.externalnav.ExternalNavigationHandler {
+-keep class org.chromium.components.external_intents.ExternalNavigationHandler {
     *** clobberCurrentTabWithFallbackUrl(...);
 }
 
 -keep class org.chromium.chrome.browser.LaunchIntentDispatcher {
     *** isCustomTabIntent(...);
 }
+
+-keep class org.chromium.chrome.browser.homepage.HomepageManager {
+    *** shouldCloseAppWithZeroTabs(...);
+}
diff --git a/android/java/org/chromium/chrome/browser/BraveActivity.java b/android/java/org/chromium/chrome/browser/BraveActivity.java
@@ -34,6 +34,8 @@
 import org.chromium.chrome.browser.BraveSyncWorker;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.bookmarks.BookmarkModel;
+import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
+import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService;
 import org.chromium.chrome.browser.onboarding.OnboardingActivity;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
@@ -51,7 +53,7 @@
 import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout;
 import org.chromium.chrome.browser.util.BraveDbUtil;
 import org.chromium.chrome.browser.util.BraveReferrer;
-import org.chromium.chrome.browser.util.UrlConstants;
+import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.chrome.browser.settings.BackgroundImagesPreferences;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
@@ -61,7 +63,7 @@
  * Brave's extension for ChromeActivity
  */
 @JNINamespace("chrome::android")
-public abstract class BraveActivity extends ChromeActivity {
+public abstract class BraveActivity<C extends ChromeActivityComponent> extends ChromeActivity {
     public static final int SITE_BANNER_REQUEST_CODE = 33;
     public static final int VERIFY_WALLET_ACTIVITY_REQUEST_CODE = 34;
     public static final int USER_WALLET_ACTIVITY_REQUEST_CODE = 35;

diff --git a/android/java/org/chromium/chrome/browser/BraveHelper.java b/android/java/org/chromium/chrome/browser/BraveHelper.java
@@ -7,7 +7,7 @@
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
-import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.firstrun.FirstRunStatus;
 
 public class BraveHelper {

diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java
@@ -18,7 +18,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.chromium.chrome.browser.util.IntentUtils;
+import org.chromium.base.IntentUtils;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.BraveRewardsHelper;
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
@@ -51,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_);
         Tab currentActiveTab = BraveRewardsHelper.currentActiveTab();
-        String url = currentActiveTab.getUrl();
+        String url = currentActiveTab.getUrlString();
         String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL;
         mIconFetcher = new org.chromium.chrome.browser.BraveRewardsHelper();
         mIconFetcher.retrieveLargeIcon(favicon_url, this);

diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java
@@ -25,12 +25,14 @@
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.BraveActivity;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
-import org.chromium.chrome.browser.favicon.IconType;
-import org.chromium.chrome.browser.favicon.LargeIconBridge;
+import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.ui.favicon.IconType;
+import org.chromium.chrome.browser.ui.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabImpl;
-import org.chromium.chrome.browser.favicon.RoundedIconGenerator;
+import org.chromium.chrome.browser.ui.favicon.RoundedIconGenerator;
 import org.chromium.chrome.R;
+import org.chromium.url.GURL;
 
 import java.math.BigDecimal;
 import java.util.Calendar;
@@ -61,7 +63,7 @@ public interface LargeIconReadyCallback {
 
     public BraveRewardsHelper () {
         if (mLargeIconBridge == null) {
-            mLargeIconBridge = new LargeIconBridge(((TabImpl)currentActiveTab()).getProfile());
+            mLargeIconBridge = new LargeIconBridge(Profile.fromWebContents(((TabImpl)currentActiveTab()).getWebContents()));
         }
     }
 
@@ -94,7 +96,7 @@ private void retrieveLargeIconInternal() {
         if (mFaviconUrl == null || mFaviconUrl.isEmpty() || mFaviconUrl.equals("clear")) {
             Tab tab  = currentActiveTab();
             if (tab != null) {
-                mFaviconUrl = tab.getUrl();
+                mFaviconUrl = tab.getUrlString();
             }
 
             mHandler.postDelayed(new Runnable() {
@@ -109,7 +111,7 @@ public void run() {
 
         //get the icon
         if (mLargeIconBridge!= null && mCallback != null && !mFaviconUrl.isEmpty()) {
-            mLargeIconBridge.getLargeIconForUrl(mFaviconUrl,FAVICON_DESIRED_SIZE, this);
+            mLargeIconBridge.getLargeIconForUrl(new GURL(mFaviconUrl),FAVICON_DESIRED_SIZE, this);
         }
     }
 

diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java
@@ -16,7 +16,7 @@
 import org.chromium.chrome.browser.BraveRewardsObserver;
 import org.chromium.chrome.browser.BraveRewardsPublisher.PublisherStatus;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.util.UrlConstants;
+import org.chromium.components.embedder_support.util.UrlConstants;
 import org.json.JSONException;
 
 import java.util.ArrayList;
@@ -154,7 +154,7 @@ private void TriggerOnNotifyFrontTabUrlChanged() {
             public void run() {
                 Tab tab = BraveRewardsHelper.currentActiveTab();
                 if (tab != null && !tab.isIncognito()) {
-                    OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl());
+                    OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString());
                 }
             }
         });

diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java
@@ -650,7 +650,7 @@ public void ShowWebSiteView(boolean returning_to_rewards) {
           ShowRewardsSummary();
           Tab currentActiveTab = BraveRewardsHelper.currentActiveTab();
           if (currentActiveTab != null && !currentActiveTab.isIncognito()) {
-            String url = currentActiveTab.getUrl();
+            String url = currentActiveTab.getUrlString();
             if (URLUtil.isValidUrl(url)) {
                 mBraveRewardsNativeWorker.GetPublisherInfo(currentActiveTab.getId(), url);
                 mPublisherFetcher = new Timer();
@@ -1241,7 +1241,7 @@ public void OnPublisherInfo(int tabId) {
 
         String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId);
         Tab currentActiveTab = BraveRewardsHelper.currentActiveTab();
-        String url = currentActiveTab.getUrl();
+        String url = currentActiveTab.getUrlString();
         final String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL;
 
         mIconFetcher.retrieveLargeIcon(favicon_url,this);

diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java
@@ -23,7 +23,7 @@
 import android.widget.ToggleButton;
 import android.text.Spanned;
 import android.view.MotionEvent;
-import org.chromium.chrome.browser.util.IntentUtils;
+import org.chromium.base.IntentUtils;
 import org.chromium.chrome.browser.BraveRewardsBalance;
 import org.chromium.chrome.browser.BraveRewardsHelper;
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
@@ -129,7 +129,7 @@ public void onClick(View view) {
 
         String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_);
         Tab currentActiveTab = BraveRewardsHelper.currentActiveTab();
-        String url = currentActiveTab.getUrl();
+        String url = currentActiveTab.getUrlString();
         String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL;
         mIconFetcher = new BraveRewardsHelper();
         mIconFetcher.retrieveLargeIcon(favicon_url, this);

diff --git a/android/java/org/chromium/chrome/browser/BraveSyncWorker.java b/android/java/org/chromium/chrome/browser/BraveSyncWorker.java
@@ -2567,7 +2567,7 @@ public void run() {
                                 mNewBookmarkModel.setBookmarkTitle(bookmarkId, mTitle);
                             }
                             if (!mUrl.isEmpty() && bookmarkItem.isUrlEditable()) {
-                                String fixedUrl = UrlFormatter.fixupUrl(mUrl);
+                                String fixedUrl = UrlFormatter.fixupUrl(mUrl).getSpec();
                                 if (null != fixedUrl && !fixedUrl.equals(bookmarkItem.getTitle())) {
                                     mNewBookmarkModel.setBookmarkUrl(bookmarkId, fixedUrl);
                                 }

diff --git a/android/java/org/chromium/chrome/browser/BraveUphold.java b/android/java/org/chromium/chrome/browser/BraveUphold.java
@@ -19,7 +19,7 @@
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
 import org.chromium.chrome.browser.BraveRewardsObserver;
 import org.chromium.chrome.browser.externalnav.BraveExternalNavigationHandler;
-import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
+import org.chromium.components.external_intents.ExternalNavigationParams;
 import org.chromium.chrome.R;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
@@ -20,12 +20,12 @@
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
-import org.chromium.chrome.browser.flags.FeatureUtilities;
 import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
 import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.tabbed_mode.TabbedAppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
@@ -96,7 +96,7 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
 
         // Hide bookmark button if bottom toolbar is enabled
         ImageButton bookmarkButton = view.findViewById(R.id.bookmark_this_page_id);
-        if (bookmarkButton != null && FeatureUtilities.isBottomToolbarEnabled()) {
+        if (bookmarkButton != null && BottomToolbarConfiguration.isBottomToolbarEnabled()) {
             bookmarkButton.setVisibility(View.GONE);
         }
 

diff --git a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java
@@ -9,8 +9,8 @@
 import android.os.Bundle;
 
 import org.chromium.chrome.browser.BraveHelper;
-import org.chromium.chrome.browser.flags.FeatureUtilities;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
 
 /**
  * Base class for ChromeLauncherActivity
@@ -22,7 +22,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         SharedPreferencesManager.getInstance().disableKeyCheckerForTesting();
 
-        FeatureUtilities.isBottomToolbarEnabled();
+        BottomToolbarConfiguration.isBottomToolbarEnabled();
         BraveHelper.DisableFREDRP();
     }
 }
diff --git a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
@@ -5,16 +5,15 @@
 
 package org.chromium.chrome.browser.externalnav;
 
-import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
-import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
+import org.chromium.components.external_intents.ExternalNavigationDelegate;
+import org.chromium.components.external_intents.ExternalNavigationHandler;
+import org.chromium.components.external_intents.ExternalNavigationParams;
+import org.chromium.components.external_intents.ExternalNavigationHandler.OverrideUrlLoadingResult;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.BraveUphold;
 
 public class BraveExternalNavigationHandler extends ExternalNavigationHandler {
     private BraveUphold mBraveUphold;
-    public BraveExternalNavigationHandler(Tab tab) {
-        super(tab);
-    }
 
     public BraveExternalNavigationHandler(ExternalNavigationDelegate delegate) {
         super(delegate);

diff --git a/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java b/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java
@@ -0,0 +1,15 @@
+/* Copyright (c) 2020 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 http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.homepage;
+
+import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager;
+
+// see org.brave.bytecode.BraveHomepageManagerClassAdapter
+public class BraveHomepageManager {
+    public static boolean shouldCloseAppWithZeroTabs() {
+        return CloseBraveManager.shouldCloseAppWithZeroTabs();
+    }
+}
diff --git a/...tings/homepage/BraveHomepageSettings.java → ...epage/settings/BraveHomepageSettings.java b/...tings/homepage/BraveHomepageSettings.java → ...epage/settings/BraveHomepageSettings.java
@@ -3,13 +3,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.homepage;
+package org.chromium.chrome.browser.homepage.settings;
 
 import android.os.Bundle;
 
-import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
-import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.homepage.HomepageSettings;
+import org.chromium.chrome.browser.homepage.HomepageManager;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.chrome.browser.homepage.settings.HomepageSettings;
 
 public class BraveHomepageSettings extends HomepageSettings {
     private HomepageManager mHomepageManager;

diff --git a/...BraveRadioButtonGroupThemePreference.java → ...BraveRadioButtonGroupThemePreference.java b/...BraveRadioButtonGroupThemePreference.java → ...BraveRadioButtonGroupThemePreference.java
@@ -3,10 +3,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.themes;
+package org.chromium.chrome.browser.night_mode.settings;
 
 import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 

diff --git a/...ettings/themes/BraveThemePreferences.java → ..._mode/settings/BraveThemePreferences.java b/...ettings/themes/BraveThemePreferences.java → ..._mode/settings/BraveThemePreferences.java
@@ -3,22 +3,22 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.themes;
+package org.chromium.chrome.browser.night_mode.settings;
 
 import static org.chromium.chrome.browser.preferences.ChromePreferenceKeys.UI_THEME_DARKEN_WEBSITES_ENABLED;
 import static org.chromium.chrome.browser.preferences.ChromePreferenceKeys.UI_THEME_SETTING;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.chrome.R;
 import org.chromium.base.BuildInfo;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
+import org.chromium.chrome.browser.night_mode.ThemeType;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
-import org.chromium.chrome.browser.settings.SettingsUtils;
-import org.chromium.chrome.browser.settings.themes.ThemeType;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge;