brave · tapanmodh · Jan 11, 2023 · Jan 3, 2023 · deeppandya · Jan 9, 2023
@@ -262,7 +262,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/partnercustomizations/CloseBraveManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsBase.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePreferenceKeys.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",
@@ -456,6 +455,7 @@ brave_browser_ui_android_toolbar_sources = [
 brave_java_base_sources = [
   "//brave/android/java/org/chromium/base/BraveCommandLineInitUtil.java",
   "//brave/android/java/org/chromium/base/BraveFeatureList.java",
+  "//brave/android/java/org/chromium/base/BravePreferenceKeys.java",
   "//brave/android/java/org/chromium/base/BraveReflectionUtil.java",
 ]
 

diff --git a/...java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabUiFeatureUtilities.java b/...java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabUiFeatureUtilities.java
@@ -8,8 +8,8 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.chrome.browser.flags.CachedFeatureFlags;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
 public class BraveTabUiFeatureUtilities {

diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
@@ -461,6 +461,14 @@
     public <init>(...);
 }
 
+-keep class org.chromium.chrome.browser.download.BraveDownloadMessageUiControllerImpl {
+    *** isVisibleToUser(...);
+}
+
+-keep class org.chromium.chrome.browser.download.DownloadMessageUiControllerImpl {
+    *** isVisibleToUser(...);
+}
+
 -keep class org.chromium.chrome.browser.omnibox.suggestions.BraveAutocompleteCoordinator {
     *** createViewProvider(...);
 }

diff --git a/...wser/preferences/BravePreferenceKeys.java → ...rg/chromium/base/BravePreferenceKeys.java b/...wser/preferences/BravePreferenceKeys.java → ...rg/chromium/base/BravePreferenceKeys.java
@@ -1,9 +1,9 @@
 /* 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/. */
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.preferences;
+package org.chromium.base;
 
 public final class BravePreferenceKeys {
     public static final String BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY =
@@ -25,6 +25,8 @@ public final class BravePreferenceKeys {
             "org.chromium.chrome.browser.upgrade.Milliseconds_New";
     public static final String BRAVE_DOWNLOADS_AUTOMATICALLY_OPEN_WHEN_POSSIBLE =
             "org.chromium.chrome.browser.downloads.Automatically_Open_When_Possible";
+    public static final String BRAVE_DOWNLOADS_DOWNLOAD_PROGRESS_NOTIFICATION_BUBBLE =
+            "org.chromium.chrome.browser.downloads.Download_Progress_Notification_Bubble";
     public static final String BRAVE_DOUBLE_RESTART =
             "org.chromium.chrome.browser.Brave_Double_Restart";
     public static final String BRAVE_TAB_GROUPS_ENABLED =

diff --git a/android/java/org/chromium/chrome/browser/BraveLaunchIntentDispatcher.java b/android/java/org/chromium/chrome/browser/BraveLaunchIntentDispatcher.java
@@ -8,8 +8,8 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 
 // see org.brave.bytecode.BraveLaunchIntentDispatcherClassAdapter
 public class BraveLaunchIntentDispatcher {

diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java
@@ -25,13 +25,13 @@
 
 import androidx.annotation.Nullable;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.app.BraveActivity;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;

diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -53,6 +53,7 @@
 
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.BraveFeatureList;
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.BraveReflectionUtil;
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.CommandLine;
@@ -142,7 +143,6 @@
 import org.chromium.chrome.browser.onboarding.v2.HighlightView;
 import org.chromium.chrome.browser.preferences.BravePref;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
 import org.chromium.chrome.browser.preferences.PrefChangeRegistrar.PrefObserver;

diff --git a/android/java/org/chromium/chrome/browser/brave_news/BraveNewsBottomSheetDialogFragment.java b/android/java/org/chromium/chrome/browser/brave_news/BraveNewsBottomSheetDialogFragment.java
@@ -20,10 +20,10 @@
 
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.brave_news.mojom.BraveNewsController;
 import org.chromium.brave_news.mojom.UserEnabled;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.util.TabUtils;
 

diff --git a/android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java b/android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java
@@ -58,6 +58,7 @@
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.brave_news.mojom.Article;
@@ -79,7 +80,6 @@
 import org.chromium.chrome.browser.local_database.DatabaseHelper;
 import org.chromium.chrome.browser.local_database.DisplayAdsTable;
 import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.rate.BraveRateDialogFragment;
 import org.chromium.chrome.browser.util.ConfigurationUtils;

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/KeystoreHelper.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/KeystoreHelper.java
@@ -9,7 +9,7 @@
 import android.security.keystore.KeyProperties;
 import android.util.Base64;
 
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
 import java.io.IOException;

diff --git a/android/java/org/chromium/chrome/browser/download/BraveMimeUtils.java b/android/java/org/chromium/chrome/browser/download/BraveMimeUtils.java
@@ -5,8 +5,8 @@
 
 package org.chromium.chrome.browser.download;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 
 public class BraveMimeUtils {
     public static boolean canAutoOpenMimeType(String mimeType) {

diff --git a/android/java/org/chromium/chrome/browser/download/settings/BraveDownloadSettings.java b/android/java/org/chromium/chrome/browser/download/settings/BraveDownloadSettings.java
@@ -10,9 +10,9 @@
 import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.SettingsUtils;
 
@@ -22,8 +22,12 @@ public class BraveDownloadSettings
             "automatically_open_when_possible";
     private static final String PREF_DOWNLOAD_LATER_PROMPT_ENABLED =
             "download_later_prompt_enabled";
+    public static final String PREF_LOCATION_PROMPT_ENABLED = "location_prompt_enabled";
+    private static final String PREF_DOWNLOAD_PROGRESS_NOTIFICATION_BUBBLE =
+            "download_progress_notification_bubble";
 
     private ChromeSwitchPreference mAutomaticallyOpenWhenPossiblePref;
+    private ChromeSwitchPreference mDownloadProgressNotificationBubblePref;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -35,6 +39,17 @@ public void onCreate(Bundle savedInstanceState) {
                 (ChromeSwitchPreference) findPreference(PREF_AUTOMATICALLY_OPEN_WHEN_POSSIBLE);
         mAutomaticallyOpenWhenPossiblePref.setOnPreferenceChangeListener(this);
 
+        mDownloadProgressNotificationBubblePref =
+                (ChromeSwitchPreference) findPreference(PREF_DOWNLOAD_PROGRESS_NOTIFICATION_BUBBLE);
+        mDownloadProgressNotificationBubblePref.setOnPreferenceChangeListener(this);
+
+        ChromeSwitchPreference locationPromptEnabledPref =
+                (ChromeSwitchPreference) findPreference(PREF_LOCATION_PROMPT_ENABLED);
+        if (locationPromptEnabledPref != null) {
+            locationPromptEnabledPref.setTitle(
+                    R.string.brave_download_location_prompt_enabled_title);
+        }
+
         ChromeSwitchPreference downloadLaterPromptEnabledPref =
                 (ChromeSwitchPreference) findPreference(PREF_DOWNLOAD_LATER_PROMPT_ENABLED);
         assert downloadLaterPromptEnabledPref != null : "Upstream applied new changes!";
@@ -54,6 +69,12 @@ private void updateDownloadSettings() {
         boolean automaticallyOpenWhenPossible = ContextUtils.getAppSharedPreferences().getBoolean(
                 BravePreferenceKeys.BRAVE_DOWNLOADS_AUTOMATICALLY_OPEN_WHEN_POSSIBLE, true);
         mAutomaticallyOpenWhenPossiblePref.setChecked(automaticallyOpenWhenPossible);
+
+        boolean downloadProgressNotificationBubble =
+                ContextUtils.getAppSharedPreferences().getBoolean(
+                        BravePreferenceKeys.BRAVE_DOWNLOADS_DOWNLOAD_PROGRESS_NOTIFICATION_BUBBLE,
+                        false);
+        mDownloadProgressNotificationBubblePref.setChecked(downloadProgressNotificationBubble);
     }
 
     // Preference.OnPreferenceChangeListener implementation.
@@ -66,6 +87,13 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                             BravePreferenceKeys.BRAVE_DOWNLOADS_AUTOMATICALLY_OPEN_WHEN_POSSIBLE,
                             (boolean) newValue)
                     .apply();
+        } else if (PREF_DOWNLOAD_PROGRESS_NOTIFICATION_BUBBLE.equals(preference.getKey())) {
+            ContextUtils.getAppSharedPreferences()
+                    .edit()
+                    .putBoolean(BravePreferenceKeys
+                                        .BRAVE_DOWNLOADS_DOWNLOAD_PROGRESS_NOTIFICATION_BUBBLE,
+                            (boolean) newValue)
+                    .apply();
         }
         return super.onPreferenceChange(preference, newValue);
     }

diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
@@ -49,6 +49,7 @@
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import org.chromium.base.BraveFeatureList;
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
@@ -97,7 +98,6 @@
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
 import org.chromium.chrome.browser.preferences.BravePref;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.query_tiles.BraveQueryTileSection;

diff --git a/android/java/org/chromium/chrome/browser/rate/RateUtils.java b/android/java/org/chromium/chrome/browser/rate/RateUtils.java
@@ -10,9 +10,9 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.set_default_browser.BraveSetDefaultBrowserUtils;
 import org.chromium.chrome.browser.vpn.utils.BraveVpnPrefUtils;

diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java
@@ -69,6 +69,7 @@
 
 import org.json.JSONException;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.BraveReflectionUtil;
 import org.chromium.base.BuildInfo;
 import org.chromium.base.ContextUtils;
@@ -95,7 +96,6 @@
 import org.chromium.chrome.browser.notifications.BraveNotificationWarningDialog;
 import org.chromium.chrome.browser.notifications.BravePermissionUtils;
 import org.chromium.chrome.browser.preferences.BravePref;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;

diff --git a/...oid/java/org/chromium/chrome/browser/set_default_browser/BraveSetDefaultBrowserUtils.java b/...oid/java/org/chromium/chrome/browser/set_default_browser/BraveSetDefaultBrowserUtils.java
@@ -23,10 +23,10 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.util.BraveConstants;
 import org.chromium.components.embedder_support.util.UrlConstants;

diff --git a/...org/chromium/chrome/browser/set_default_browser/SetDefaultBrowserBottomSheetFragment.java b/...org/chromium/chrome/browser/set_default_browser/SetDefaultBrowserBottomSheetFragment.java
@@ -20,8 +20,8 @@
 
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
 public class SetDefaultBrowserBottomSheetFragment extends BottomSheetDialogFragment {

diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java
@@ -13,6 +13,7 @@
 import androidx.preference.Preference;
 
 import org.chromium.base.BraveFeatureList;
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveFeatureUtil;
@@ -22,7 +23,6 @@
 import org.chromium.chrome.browser.app.flags.ChromeCachedFlags;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.night_mode.NightModeUtils;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.chrome.browser.tasks.tab_management.BraveTabUiFeatureUtilities;

diff --git a/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java
@@ -5,15 +5,16 @@
 
 package org.chromium.chrome.browser.settings;
 
-import android.os.Bundle;
 import android.content.SharedPreferences;
+import android.os.Bundle;
+
 import androidx.preference.Preference;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
+import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveLaunchIntentDispatcher;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
-import org.chromium.chrome.R;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.SettingsUtils;
 

diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsCategorySources.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsCategorySources.java
@@ -17,13 +17,13 @@
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
 import org.chromium.brave_news.mojom.BraveNewsController;
 import org.chromium.brave_news.mojom.Publisher;
 import org.chromium.brave_news.mojom.UserEnabled;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.brave_news.BraveNewsControllerFactory;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.settings.SearchPreference;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;

diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferences.java
@@ -19,6 +19,7 @@
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
 import org.chromium.brave_news.mojom.BraveNewsController;
 import org.chromium.brave_news.mojom.Publisher;
@@ -28,7 +29,6 @@
 import org.chromium.chrome.browser.BraveLaunchIntentDispatcher;
 import org.chromium.chrome.browser.brave_news.BraveNewsControllerFactory;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.chrome.browser.settings.SettingsLauncherImpl;

diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesDetails.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesDetails.java
@@ -24,6 +24,7 @@
 
 import com.bumptech.glide.Glide;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
 import org.chromium.brave_news.mojom.BraveNewsController;
@@ -34,7 +35,6 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.brave_news.BraveNewsControllerFactory;
 import org.chromium.chrome.browser.brave_news.BraveNewsUtils;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.chrome.browser.util.BraveConstants;

diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesV2.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesV2.java
@@ -26,6 +26,7 @@
 import com.airbnb.lottie.LottieProperty;
 import com.airbnb.lottie.model.KeyPath;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
@@ -38,7 +39,6 @@
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.chrome.browser.util.BraveConstants;

diff --git a/android/java/org/chromium/chrome/browser/share/BraveShareDelegateImpl.java b/android/java/org/chromium/chrome/browser/share/BraveShareDelegateImpl.java
@@ -5,9 +5,9 @@
 
 package org.chromium.chrome.browser.share;
 
+import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
-import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;