[Android] ChosenObjectSettings base class changed.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/754e9e09910ebe1ec39c262d1fb22119d30d955e

commit 754e9e09910ebe1ec39c262d1fb22119d30d955e
Author: Robbie McElrath <[email protected]>
Date:   Mon Mar 30 19:00:18 2020 +0000

    [WebLayer] Create a SiteSettingsClient interface.

    This interface is used by the Site Settings UI to get embedder-specific
    logic, and will be used to abstract Chrome-specific logic so the rest
    of the Site Settings UI can be componentized. The Client is set in the
    Fragment by SettingsActivity.

    As of this CL, only the ManagedPreferenceDelegate is accessible through
    this new interface, but other embedder-specific logic will be moved
    behind it as well in future CLs.

    See go/weblayer-site-settings for more information.

    Bug: 1058597

android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java

@@ -18,7 +18,7 @@
 
 import java.util.HashMap;
 
-public class BraveSiteSettingsPreferencesBase extends BravePreferenceFragment {
+public class BraveSiteSettingsPreferencesBase extends SiteSettingsPreferenceFragment {
     private static final String DESKTOP_MODE_CATEGORY_KEY = "desktop_mode_category";
     private static final String PLAY_YT_VIDEO_IN_BROWSER_CATEGORY_KEY = "play_yt_video_in_browser_category";
     private static final String ADS_KEY = "ads";

patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch

@@ -1,17 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
-index 46a8f69a21ef6ce6b914e48d32d917a0846eb5bb..d91bca6fa33ce8132d32737385a4db5a1b8fb6ec 100644
+index e3ad44adfd849b0d390cb8e797e2049aab40decf..aa03e6403e64ce52b7d5aa8a7f2d7a935c0da9cf 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
-@@ -37,7 +37,7 @@ import java.util.Locale;
-  * Shows a particular chosen object (e.g. a USB device) and the list of sites that have been
-  * granted access to it by the user.
-  */
--public class ChosenObjectSettings extends PreferenceFragmentCompat {
-+public class ChosenObjectSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
-     public static final String EXTRA_OBJECT_INFOS = "org.chromium.chrome.preferences.object_infos";
-     public static final String EXTRA_SITES = "org.chromium.chrome.preferences.site_set";
-     public static final String EXTRA_CATEGORY =
-@@ -136,7 +136,7 @@ public class ChosenObjectSettings extends PreferenceFragmentCompat {
+@@ -134,7 +134,7 @@ public class ChosenObjectSettings extends SiteSettingsPreferenceFragment {
                      null);
              return true;
          }

patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch

@@ -1,17 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
-index 6a25cd6017790bf153781ca1be210e41824649c2..407acb17dfecb23d403e074cb63c6f1da04ecb1b 100644
+index 55dbf87b53bc281ec760f4442dad68e52f8c849e..f9dd0b11d158bf88e2ec71575175d52c63f140b1 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
-@@ -75,7 +75,7 @@ import java.util.Set;
-  * the websites with microphone permissions. When the user selects a site, SingleWebsiteSettings
-  * is launched to allow the user to see or modify the settings for that particular website.
-  */
--public class SingleCategorySettings extends PreferenceFragmentCompat
-+public class SingleCategorySettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment
-         implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
-                    AddExceptionPreference.SiteAddedCallback, View.OnClickListener,
-                    PreferenceManager.OnPreferenceTreeClickListener {
-@@ -408,7 +408,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
+@@ -427,7 +427,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              if (queryHasChanged) getInfoForOrigins();
              return true;
          }

patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettings.java.patch

@@ -1,12 +1,12 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java
-index c5b727493d132dac5102d10b14fa92940fb9e43c..a6475c8669456eab83a77474bef2ec1717bf8978 100644
+index 92717e721dc19c4d1f53610e50a912bdc7ad2409..89ef2f8db0bbaed95feeee61c3adf2d198fcb6b4 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java
-@@ -28,7 +28,7 @@ import java.util.List;
+@@ -27,7 +27,7 @@ import java.util.List;
   * browser-wide.
   */
  public class SiteSettings
--        extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener {
+-        extends SiteSettingsPreferenceFragment implements Preference.OnPreferenceClickListener {
 +        extends BraveSiteSettingsPreferencesBase implements Preference.OnPreferenceClickListener {
      // The keys for each category shown on the Site Settings page
      // are defined in the SiteSettingsCategory.

patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettingsPreferenceFragment.java.patch

@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettingsPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettingsPreferenceFragment.java
+index 8f2a87d527c43ae611c5ad53c43901c0ab87c493..8d71e467e24eb0c9ae227eb6fca53b2b4b2269e0 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettingsPreferenceFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettingsPreferenceFragment.java
+@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat;
+ /**
+  * Preference fragment for showing the Site Settings UI.
+  */
+-public abstract class SiteSettingsPreferenceFragment extends PreferenceFragmentCompat {
++public abstract class SiteSettingsPreferenceFragment extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
+     private SiteSettingsClient mSiteSettingsClient;
+
+     /**