From 1a52414a5582ee7120b10e7d0c32e2238abcfba6 Mon Sep 17 00:00:00 2001
From: Artem Samoilenko <artem@brave.com>
Date: Thu, 5 Oct 2023 15:50:30 -0400
Subject: [PATCH] [Android] Rename SiteSettingsPreferenceFragment

https://github.com/brave/chromium/commit/41965636b6da1c2723fc99371bfbc9e3ad218cb6

Rename SiteSettingsPreferenceFragment
Bug: 1485637
---
 .../toolbar/bottom/BottomToolbarVariationManager.java        | 5 +----
 .../site_settings/BraveSingleCategorySettings.java           | 2 +-
 .../browser_ui/site_settings/BraveSingleWebsiteSettings.java | 2 +-
 .../site_settings/BraveSiteSettingsPreferencesBase.java      | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java
index be2e58e0359..e297aaeccd5 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java
@@ -5,12 +5,9 @@
 
 package org.chromium.chrome.browser.toolbar.bottom;
 
-import org.chromium.chrome.browser.flags.CachedFeatureFlags;
-
 /**
  * The variation manager helps figure out the current variation and the visibility of buttons on
- * bottom toolbar. Every operation related to the variation, e.g. getting variation value, should be
- * through {@link BottomToolbarVariationManager} rather than calling {@link CachedFeatureFlags}.
+ * bottom toolbar.
  */
 public class BottomToolbarVariationManager {
     /**
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java
index 46e9e1ae628..5fbb3fbafb7 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java
@@ -13,7 +13,7 @@ import org.chromium.content_public.browser.BrowserContextHandle;
 
 @UsedByReflection("brave_site_settings_preferences.xml")
 public class BraveSingleCategorySettings
-        extends SiteSettingsPreferenceFragment implements AddExceptionPreference.SiteAddedCallback {
+        extends BaseSiteSettingsFragment implements AddExceptionPreference.SiteAddedCallback {
     private static final String ADD_EXCEPTION_KEY = "add_exception";
 
     @Override
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleWebsiteSettings.java
index a369e962620..29ea24506c6 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleWebsiteSettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleWebsiteSettings.java
@@ -17,7 +17,7 @@ import org.chromium.components.content_settings.ContentSettingValues;
 import org.chromium.components.content_settings.ContentSettingsType;
 import org.chromium.content_public.browser.BrowserContextHandle;
 
-public class BraveSingleWebsiteSettings extends SiteSettingsPreferenceFragment {
+public class BraveSingleWebsiteSettings extends BaseSiteSettingsFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {}
 
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java
index 8a076f4439b..218df2b2e9c 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java
@@ -13,7 +13,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
 
 import java.util.HashMap;
 
-public class BraveSiteSettingsPreferencesBase extends SiteSettingsPreferenceFragment {
+public class BraveSiteSettingsPreferencesBase extends BaseSiteSettingsFragment {
     private static final String PLAY_YT_VIDEO_IN_BROWSER_CATEGORY_KEY = "play_yt_video_in_browser_category";
     private static final String ADS_KEY = "ads";
     private static final String BACKGROUND_SYNC_KEY = "background_sync";