Rename Site Settings fragments

Following the naming conventions decided in go/clank-preferences-refactor,
this change replaces the "Preferences" suffix with "Settings".

Skip presubmit to avoid AlertDialog checks for existing usages.

NOPRESUBMIT=true

Bug: 1030446
Change-Id: Iebdf6d7d6a552c05179cd767f9fd7e0a288dc3ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974675Reviewed-by: Brandon Wylie <wylieb@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726465}

chrome/android/chrome_java_sources.gni

@@ -1457,7 +1457,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/themes/ThemeType.java",
   "java/src/org/chromium/chrome/browser/settings/website/AddExceptionPreference.java",
   "java/src/org/chromium/chrome/browser/settings/website/ChosenObjectInfo.java",
-  "java/src/org/chromium/chrome/browser/settings/website/ChosenObjectPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/website/ChosenObjectSettings.java",
   "java/src/org/chromium/chrome/browser/settings/website/ClearWebsiteStorage.java",
   "java/src/org/chromium/chrome/browser/settings/website/ClearWebsiteStorageDialog.java",
   "java/src/org/chromium/chrome/browser/settings/website/ContentSetting.java",
@@ -1470,12 +1470,12 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/website/NotificationCategory.java",
   "java/src/org/chromium/chrome/browser/settings/website/PermissionInfo.java",
   "java/src/org/chromium/chrome/browser/settings/website/SettingsNavigationSource.java",
-  "java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java",
-  "java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java",
+  "java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java",
   "java/src/org/chromium/chrome/browser/settings/website/SiteDataCleaner.java",
+  "java/src/org/chromium/chrome/browser/settings/website/SiteSettings.java",
   "java/src/org/chromium/chrome/browser/settings/website/SiteSettingsCategory.java",
   "java/src/org/chromium/chrome/browser/settings/website/SiteSettingsPreference.java",
-  "java/src/org/chromium/chrome/browser/settings/website/SiteSettingsPreferences.java",
   "java/src/org/chromium/chrome/browser/settings/website/StorageInfo.java",
   "java/src/org/chromium/chrome/browser/settings/website/TriStateSiteSettingsPreference.java",
   "java/src/org/chromium/chrome/browser/settings/website/Website.java",

chrome/android/chrome_test_java_sources.gni

@@ -423,7 +423,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/settings/themes/ThemeSettingsFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/website/ManageSpaceActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/website/PermissionInfoTest.java",
-  "javatests/src/org/chromium/chrome/browser/settings/website/SiteSettingsPreferencesTest.java",
+  "javatests/src/org/chromium/chrome/browser/settings/website/SiteSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/website/SiteSettingsTestUtils.java",
   "javatests/src/org/chromium/chrome/browser/settings/website/WebsiteAddressTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/website/WebsitePermissionsFetcherTest.java",

chrome/android/java/res/xml/main_preferences.xml

@@ -81,7 +81,7 @@
         android:order="14"
         android:title="@string/prefs_accessibility"/>
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.website.SiteSettingsPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SiteSettings"
         android:key="content_settings"
         android:order="15"
         android:title="@string/prefs_site_settings"/>

chrome/android/java/res/xml/notifications_preferences.xml

@@ -11,7 +11,7 @@
         android:summary="@string/notifications_content_suggestions_summary" />
 
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:title="@string/notifications_from_websites_title"
         android:key="from_websites" />
 </PreferenceScreen>
\ No newline at end of file

chrome/android/java/res/xml/site_settings_preferences.xml

@@ -8,7 +8,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <!-- All sites -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="all_sites"
         android:title="@string/all_sites"
         android:icon="@drawable/settings_all_sites"
@@ -16,77 +16,77 @@
     <!-- Cookies -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
         android:key="cookies"
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences" />
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings" />
     <!-- Location -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="device_location" />
     <!-- Camera -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="camera" />
     <!-- Microphone -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="microphone" />
     <!-- Sensors -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="sensors" />
     <!-- Notifications -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="notifications" />
     <!-- JavaScript -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="javascript" />
     <!-- Popups -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="popups" />
     <!-- Ads -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="ads" />
     <!-- Background sync -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="background_sync" />
     <!-- Automatic Downloads -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="automatic_downloads" />
     <!-- Protected content -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="protected_content" />
     <!-- Sound -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="sound" />
     <!-- Storage -->
     <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="use_storage"
         android:title="@string/website_settings_storage"
         android:icon="@drawable/settings_storage"
         app:iconTint="@color/default_icon_color" />
     <!-- NFC -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="nfc" />
     <!-- USB -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="usb" />
     <!-- Clipboard API -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="clipboard" />
     <!-- Bluetooth Scanning -->
     <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategoryPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.website.SingleCategorySettings"
         android:key="bluetooth_scanning" />
 </PreferenceScreen>

chrome/android/java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivitySettingsLauncher.java

@@ -13,8 +13,8 @@ import org.chromium.base.Log;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
 import org.chromium.chrome.browser.settings.website.SettingsNavigationSource;
-import org.chromium.chrome.browser.settings.website.SingleCategoryPreferences;
-import org.chromium.chrome.browser.settings.website.SingleWebsitePreferences;
+import org.chromium.chrome.browser.settings.website.SingleCategorySettings;
+import org.chromium.chrome.browser.settings.website.SingleWebsiteSettings;
 import org.chromium.chrome.browser.settings.website.SiteSettingsCategory;
 
 import java.util.ArrayList;
@@ -56,7 +56,7 @@ public class TrustedWebActivitySettingsLauncher {
     public static void launch(Context context, Collection<String> origins,
             Collection<String> domains) {
         if (origins.size() == 1) {
-            // When launched with EXTRA_SITE_ADDRESS, SingleWebsitePreferences will merge the
+            // When launched with EXTRA_SITE_ADDRESS, SingleWebsiteSettings will merge the
             // settings for top-level origin, so that given https://peconn.github.io and
             // peconn.github.io, we'll get the permission and data settings of both.
             openSingleWebsitePrefs(context, origins.iterator().next());
@@ -75,16 +75,16 @@ public class TrustedWebActivitySettingsLauncher {
 
     private static void openFilteredAllSiteSettings(Context context, Collection<String> domains) {
         Bundle extras = new Bundle();
-        extras.putString(SingleCategoryPreferences.EXTRA_CATEGORY,
+        extras.putString(SingleCategorySettings.EXTRA_CATEGORY,
                 SiteSettingsCategory.preferenceKey(SiteSettingsCategory.Type.ALL_SITES));
-        extras.putString(SingleCategoryPreferences.EXTRA_TITLE,
+        extras.putString(SingleCategorySettings.EXTRA_TITLE,
                 context.getString(R.string.twa_clear_data_site_selection_title));
         extras.putStringArrayList(
-                SingleCategoryPreferences.EXTRA_SELECTED_DOMAINS, new ArrayList<>(domains));
+                SingleCategorySettings.EXTRA_SELECTED_DOMAINS, new ArrayList<>(domains));
         extras.putInt(SettingsNavigationSource.EXTRA_KEY,
                 SettingsNavigationSource.TWA_CLEAR_DATA_DIALOG);
 
-        SettingsLauncher.launchSettingsPage(context, SingleCategoryPreferences.class, extras);
+        SettingsLauncher.launchSettingsPage(context, SingleCategorySettings.class, extras);
     }
 
     /**
@@ -92,9 +92,9 @@ public class TrustedWebActivitySettingsLauncher {
      */
     private static Intent createIntentForSingleWebsitePreferences(
             Context context, String url, @SettingsNavigationSource int navigationSource) {
-        Bundle args = SingleWebsitePreferences.createFragmentArgsForSite(url);
+        Bundle args = SingleWebsiteSettings.createFragmentArgsForSite(url);
         args.putInt(SettingsNavigationSource.EXTRA_KEY, navigationSource);
         return SettingsLauncher.createIntentForSettingsPage(
-                context, SingleWebsitePreferences.class.getName(), args);
+                context, SingleWebsiteSettings.class.getName(), args);
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java

@@ -11,7 +11,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ResourceId;
 import org.chromium.chrome.browser.permissions.AndroidPermissionRequester;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.website.SingleCategoryPreferences;
+import org.chromium.chrome.browser.settings.website.SingleCategorySettings;
 import org.chromium.chrome.browser.settings.website.SiteSettingsCategory;
 import org.chromium.chrome.browser.tab.Tab;
 
@@ -129,10 +129,10 @@ public class PermissionInfoBar
 
     private void launchNotificationsSettingsPage() {
         Bundle fragmentArguments = new Bundle();
-        fragmentArguments.putString(SingleCategoryPreferences.EXTRA_CATEGORY,
+        fragmentArguments.putString(SingleCategorySettings.EXTRA_CATEGORY,
                 SiteSettingsCategory.preferenceKey(SiteSettingsCategory.Type.NOTIFICATIONS));
         SettingsLauncher.launchSettingsPage(
-                getContext(), SingleCategoryPreferences.class, fragmentArguments);
+                getContext(), SingleCategorySettings.class, fragmentArguments);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/infobar/SearchGeolocationDisclosureInfoBar.java

@@ -11,7 +11,7 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ResourceId;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.website.SingleWebsitePreferences;
+import org.chromium.chrome.browser.settings.website.SingleWebsiteSettings;
 
 /**
  * An infobar to disclose to the user that the default search engine has geolocation access by
@@ -57,7 +57,7 @@ public class SearchGeolocationDisclosureInfoBar extends InfoBar {
     @CalledByNative
     private static void showSettingsPage(String searchUrl) {
         Context context = ContextUtils.getApplicationContext();
-        SettingsLauncher.launchSettingsPage(context, SingleWebsitePreferences.class,
-                SingleWebsitePreferences.createFragmentArgsForSite(searchUrl));
+        SettingsLauncher.launchSettingsPage(context, SingleWebsiteSettings.class,
+                SingleWebsiteSettings.createFragmentArgsForSite(searchUrl));
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java

@@ -41,8 +41,8 @@ import org.chromium.chrome.browser.permissions.PermissionFieldTrial;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.website.SingleCategoryPreferences;
-import org.chromium.chrome.browser.settings.website.SingleWebsitePreferences;
+import org.chromium.chrome.browser.settings.website.SingleCategorySettings;
+import org.chromium.chrome.browser.settings.website.SingleWebsiteSettings;
 import org.chromium.chrome.browser.settings.website.SiteSettingsCategory;
 import org.chromium.chrome.browser.usage_stats.NotificationSuspender;
 import org.chromium.chrome.browser.webapps.ChromeWebApkHost;
@@ -267,20 +267,20 @@ public class NotificationPlatformBridge {
             RecordUserAction.record("Notifications.ShowSiteSettings");
 
             // All preferences for a specific origin.
-            fragmentArguments = SingleWebsitePreferences.createFragmentArgsForSite(origin);
+            fragmentArguments = SingleWebsiteSettings.createFragmentArgsForSite(origin);
         } else {
             // Notification preferences for all origins.
             fragmentArguments = new Bundle();
-            fragmentArguments.putString(SingleCategoryPreferences.EXTRA_CATEGORY,
+            fragmentArguments.putString(SingleCategorySettings.EXTRA_CATEGORY,
                     SiteSettingsCategory.preferenceKey(SiteSettingsCategory.Type.NOTIFICATIONS));
-            fragmentArguments.putString(SingleCategoryPreferences.EXTRA_TITLE,
+            fragmentArguments.putString(SingleCategorySettings.EXTRA_TITLE,
                     applicationContext.getResources().getString(
                             R.string.push_notifications_permission_title));
         }
 
         Class<? extends PreferenceFragmentCompat> fragment = launchSingleWebsitePreferences
-                ? SingleWebsitePreferences.class
-                : SingleCategoryPreferences.class;
+                ? SingleWebsiteSettings.class
+                : SingleCategorySettings.class;
         SettingsLauncher.launchSettingsPage(applicationContext, fragment, fragmentArguments);
     }
 
@@ -652,15 +652,15 @@ public class NotificationPlatformBridge {
         // TODO(knollr): Generalize the NotificationPlatformBridge sufficiently to not need
         // to care about the individual notification types.
         String fragmentName = notificationType == NotificationType.PERMISSION_REQUEST
-                ? SingleCategoryPreferences.class.getName()
-                : SingleWebsitePreferences.class.getName();
+                ? SingleCategorySettings.class.getName()
+                : SingleWebsiteSettings.class.getName();
         Bundle fragmentArguments = notificationType == NotificationType.PERMISSION_REQUEST
                 ? new Bundle()
-                : SingleWebsitePreferences.createFragmentArgsForSite(origin);
+                : SingleWebsiteSettings.createFragmentArgsForSite(origin);
         if (notificationType == NotificationType.PERMISSION_REQUEST) {
             // TODO(andypaicu): this needs to be content settings type agnostic, to support
             // future permission requests that are not for the notification permission.
-            fragmentArguments.putString(SingleCategoryPreferences.EXTRA_CATEGORY,
+            fragmentArguments.putString(SingleCategorySettings.EXTRA_CATEGORY,
                     SiteSettingsCategory.preferenceKey(SiteSettingsCategory.Type.NOTIFICATIONS));
         }
         // Set up a pending intent for going to the settings screen for |origin|.

chrome/android/java/src/org/chromium/chrome/browser/page_info/SiteSettingsHelper.java

@@ -11,7 +11,7 @@ import org.chromium.base.StrictModeContext;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.previews.PreviewsAndroidBridge;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.website.SingleWebsitePreferences;
+import org.chromium.chrome.browser.settings.website.SingleWebsiteSettings;
 import org.chromium.chrome.browser.util.UrlConstants;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 import org.chromium.content_public.browser.WebContents;
@@ -45,8 +45,8 @@ public class SiteSettingsHelper {
      */
     public static void showSiteSettings(Context context, String fullUrl) {
         Intent preferencesIntent = SettingsLauncher.createIntentForSettingsPage(context,
-                SingleWebsitePreferences.class.getName(),
-                SingleWebsitePreferences.createFragmentArgsForSite(fullUrl));
+                SingleWebsiteSettings.class.getName(),
+                SingleWebsiteSettings.createFragmentArgsForSite(fullUrl));
         // Disabling StrictMode to avoid violations (https://crbug.com/819410).
         try (StrictModeContext ignored = StrictModeContext.allowDiskReads()) {
             context.startActivity(preferencesIntent);

chrome/android/java/src/org/chromium/chrome/browser/settings/notifications/NotificationsSettings.java

@@ -18,7 +18,7 @@ import org.chromium.chrome.browser.offlinepages.prefetch.PrefetchPrefs;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
 import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.website.ContentSettingsResources;
-import org.chromium.chrome.browser.settings.website.SingleCategoryPreferences;
+import org.chromium.chrome.browser.settings.website.SingleCategorySettings;
 import org.chromium.chrome.browser.settings.website.SiteSettingsCategory;
 import org.chromium.chrome.browser.settings.website.WebsitePreferenceBridge;
 
@@ -54,7 +54,7 @@ public class NotificationsSettings extends PreferenceFragmentCompat {
         });
 
         mFromWebsitesPref = findPreference(PREF_FROM_WEBSITES);
-        mFromWebsitesPref.getExtras().putString(SingleCategoryPreferences.EXTRA_CATEGORY,
+        mFromWebsitesPref.getExtras().putString(SingleCategorySettings.EXTRA_CATEGORY,
                 SiteSettingsCategory.preferenceKey(SiteSettingsCategory.Type.NOTIFICATIONS));
     }
 

chrome/android/java/src/org/chromium/chrome/browser/settings/search_engine/SearchEngineAdapter.java

@@ -35,7 +35,7 @@ import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
 import org.chromium.chrome.browser.settings.website.ContentSettingValues;
 import org.chromium.chrome.browser.settings.website.PermissionInfo;
-import org.chromium.chrome.browser.settings.website.SingleWebsitePreferences;
+import org.chromium.chrome.browser.settings.website.SingleWebsiteSettings;
 import org.chromium.chrome.browser.settings.website.WebsitePreferenceBridge;
 import org.chromium.components.location.LocationUtils;
 import org.chromium.components.search_engines.TemplateUrl;
@@ -468,8 +468,8 @@ public class SearchEngineAdapter extends BaseAdapter
         if (linkBeingShown == R.string.search_engine_system_location_disabled) {
             mContext.startActivity(LocationUtils.getInstance().getSystemLocationSettingsIntent());
         } else {
-            SettingsLauncher.launchSettingsPage(mContext, SingleWebsitePreferences.class,
-                    SingleWebsitePreferences.createFragmentArgsForSite(url));
+            SettingsLauncher.launchSettingsPage(mContext, SingleWebsiteSettings.class,
+                    SingleWebsiteSettings.createFragmentArgsForSite(url));
         }
     }
 

chrome/android/java/src/org/chromium/chrome/browser/settings/website/ChosenObjectPreferences.java → chrome/android/java/src/org/chromium/chrome/browser/settings/website/ChosenObjectSettings.java

@@ -36,7 +36,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 ChosenObjectPreferences extends PreferenceFragmentCompat {
+public class ChosenObjectSettings extends PreferenceFragmentCompat {
     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 =
@@ -70,7 +70,7 @@ public class ChosenObjectPreferences extends PreferenceFragmentCompat {
                 (ArrayList<ChosenObjectInfo>) getArguments().getSerializable(EXTRA_OBJECT_INFOS);
         checkObjectConsistency();
         mSites = (ArrayList<Website>) getArguments().getSerializable(EXTRA_SITES);
-        String title = getArguments().getString(SingleCategoryPreferences.EXTRA_TITLE);
+        String title = getArguments().getString(SingleCategorySettings.EXTRA_TITLE);
         if (title != null) getActivity().setTitle(title);
 
         setHasOptionsMenu(true);
@@ -202,7 +202,7 @@ public class ChosenObjectPreferences extends PreferenceFragmentCompat {
             // After revoking a site's permission to access an object the user may end up back at
             // this activity. It is awkward to display this empty list because there's no action
             // that can be taken from it. In this case we dismiss this activity as well, taking
-            // them back to SingleCategoryPreferences which will now no longer offer the option to
+            // them back to SingleCategorySettings which will now no longer offer the option to
             // examine the permissions for this object.
             if (mObjectInfos.isEmpty()) {
                 getActivity().finish();
@@ -270,15 +270,15 @@ public class ChosenObjectPreferences extends PreferenceFragmentCompat {
         createHeader();
 
         // Each item |i| in |mSites| and |mObjectInfos| correspond to each other.
-        // See SingleCategoryPreferences.addChosenObjects().
+        // See SingleCategorySettings.addChosenObjects().
         for (int i = 0; i < mSites.size() && i < mObjectInfos.size(); ++i) {
             Website site = mSites.get(i);
             ChosenObjectInfo info = mObjectInfos.get(i);
             WebsitePreference preference =
                     new WebsitePreference(getStyledContext(), site, mCategory);
 
-            preference.getExtras().putSerializable(SingleWebsitePreferences.EXTRA_SITE, site);
-            preference.setFragment(SingleWebsitePreferences.class.getCanonicalName());
+            preference.getExtras().putSerializable(SingleWebsiteSettings.EXTRA_SITE, site);
+            preference.setFragment(SingleWebsiteSettings.class.getCanonicalName());
             preference.setImageView(R.drawable.ic_delete_white_24dp,
                     R.string.website_settings_revoke_device_permission, (View view) -> {
                         info.revoke();

chrome/android/java/src/org/chromium/chrome/browser/settings/website/ContentSettingException.java

@@ -25,7 +25,7 @@ public class ContentSettingException implements Serializable {
     public @interface Type {
         // Values used to address array index - should be enumerated from 0 and can't have gaps.
         // All updates here must also be reflected in {@link #getContentSettingsType(int)
-        // getContentSettingsType} and {@link SingleWebsitePreferences.PERMISSION_PREFERENCE_KEYS}.
+        // getContentSettingsType} and {@link SingleWebsiteSettings.PERMISSION_PREFERENCE_KEYS}.
         int ADS = 0;
         int BACKGROUND_SYNC = 1;
         int COOKIE = 2;

chrome/android/java/src/org/chromium/chrome/browser/settings/website/ManageSpaceActivity.java

@@ -235,14 +235,14 @@ public class ManageSpaceActivity extends AppCompatActivity implements View.OnCli
             mUnimportantDialog.show();
         } else if (view == mManageSiteDataButton) {
             Bundle initialArguments = new Bundle();
-            initialArguments.putString(SingleCategoryPreferences.EXTRA_CATEGORY,
+            initialArguments.putString(SingleCategorySettings.EXTRA_CATEGORY,
                     SiteSettingsCategory.preferenceKey(SiteSettingsCategory.Type.USE_STORAGE));
-            initialArguments.putString(SingleCategoryPreferences.EXTRA_TITLE,
+            initialArguments.putString(SingleCategorySettings.EXTRA_TITLE,
                     getString(R.string.website_settings_storage));
             RecordHistogram.recordEnumeratedHistogram(
                     "Android.ManageSpace.ActionTaken", OPTION_MANAGE_STORAGE, OPTION_MAX);
             SettingsLauncher.launchSettingsPage(
-                    this, SingleCategoryPreferences.class, initialArguments);
+                    this, SingleCategorySettings.class, initialArguments);
         } else if (view == mClearAllDataButton) {
             final ActivityManager activityManager =
                     (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);

chrome/android/java/src/org/chromium/chrome/browser/settings/website/PermissionInfo.java

@@ -23,7 +23,7 @@ public class PermissionInfo implements Serializable {
     public @interface Type {
         // Values used to address index - should be enumerated from 0 and can't have gaps.
         // All updates here must also be reflected in {@link #getContentSettingsType(int)
-        // getContentSettingsType} and {@link SingleWebsitePreferences.PERMISSION_PREFERENCE_KEYS}.
+        // getContentSettingsType} and {@link SingleWebsiteSettings.PERMISSION_PREFERENCE_KEYS}.
         int CAMERA = 0;
         int CLIPBOARD = 1;
         int GEOLOCATION = 2;

chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java → chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java

@@ -71,10 +71,10 @@ import java.util.Set;
 
 /**
  * Shows a list of sites in a particular Site Settings category. For example, this could show all
- * the websites with microphone permissions. When the user selects a site, SingleWebsitePreferences
+ * 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 SingleCategoryPreferences extends PreferenceFragmentCompat
+public class SingleCategorySettings extends PreferenceFragmentCompat
         implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
                    AddExceptionPreference.SiteAddedCallback, View.OnClickListener,
                    PreferenceManager.OnPreferenceTreeClickListener {
@@ -218,9 +218,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
 
         // When the toggle is set to Blocked, the Allowed list header should read 'Exceptions', not
         // 'Allowed' (because it shows exceptions from the rule).
-        int resourceId = toggleValue
-                ? R.string.website_settings_allowed_group_heading
-                : R.string.website_settings_exceptions_group_heading;
+        int resourceId = toggleValue ? R.string.website_settings_allowed_group_heading
+                                     : R.string.website_settings_exceptions_group_heading;
         allowedGroup.setTitle(getHeaderTitle(resourceId, numAllowed));
         allowedGroup.setExpanded(mAllowListExpanded);
     }
@@ -380,8 +379,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
             if (queryHasChanged) getInfoForOrigins();
         });
 
-        MenuItem help = menu.add(
-                Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
+        MenuItem help =
+                menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
         help.setIcon(VectorDrawableCompat.create(
                 getResources(), R.drawable.ic_help_and_feedback, getActivity().getTheme()));
     }
@@ -417,13 +416,13 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
 
         if (preference instanceof WebsitePreference) {
             WebsitePreference website = (WebsitePreference) preference;
-            website.setFragment(SingleWebsitePreferences.class.getName());
+            website.setFragment(SingleWebsiteSettings.class.getName());
             // EXTRA_SITE re-uses already-fetched permissions, which we can only use if the Website
             // was populated with data for all permission types.
             if (mCategory.showSites(SiteSettingsCategory.Type.ALL_SITES)) {
-                website.putSiteIntoExtras(SingleWebsitePreferences.EXTRA_SITE);
+                website.putSiteIntoExtras(SingleWebsiteSettings.EXTRA_SITE);
             } else {
-                website.putSiteAddressIntoExtras(SingleWebsitePreferences.EXTRA_SITE_ADDRESS);
+                website.putSiteAddressIntoExtras(SingleWebsiteSettings.EXTRA_SITE_ADDRESS);
             }
             int navigationSource = getArguments().getInt(
                     SettingsNavigationSource.EXTRA_KEY, SettingsNavigationSource.OTHER);
@@ -791,15 +790,14 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
         for (Pair<ArrayList<ChosenObjectInfo>, ArrayList<Website>> entry : objects.values()) {
             Preference preference = new Preference(getStyledContext());
             Bundle extras = preference.getExtras();
-            extras.putInt(
-                    ChosenObjectPreferences.EXTRA_CATEGORY, mCategory.getContentSettingsType());
+            extras.putInt(ChosenObjectSettings.EXTRA_CATEGORY, mCategory.getContentSettingsType());
             extras.putString(EXTRA_TITLE, getActivity().getTitle().toString());
-            extras.putSerializable(ChosenObjectPreferences.EXTRA_OBJECT_INFOS, entry.first);
-            extras.putSerializable(ChosenObjectPreferences.EXTRA_SITES, entry.second);
+            extras.putSerializable(ChosenObjectSettings.EXTRA_OBJECT_INFOS, entry.first);
+            extras.putSerializable(ChosenObjectSettings.EXTRA_SITES, entry.second);
             preference.setIcon(
                     ContentSettingsResources.getIcon(mCategory.getContentSettingsType()));
             preference.setTitle(entry.first.get(0).getName());
-            preference.setFragment(ChosenObjectPreferences.class.getCanonicalName());
+            preference.setFragment(ChosenObjectSettings.class.getCanonicalName());
             getPreferenceScreen().addPreference(preference);
         }
 
@@ -941,11 +939,11 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
         mCategory.configurePermissionIsOffPreferences(
                 osWarning, osWarningExtra, getActivity(), true);
         if (osWarning.getTitle() != null) {
-            osWarning.setKey(SingleWebsitePreferences.PREF_OS_PERMISSIONS_WARNING);
+            osWarning.setKey(SingleWebsiteSettings.PREF_OS_PERMISSIONS_WARNING);
             screen.addPreference(osWarning);
         }
         if (osWarningExtra.getTitle() != null) {
-            osWarningExtra.setKey(SingleWebsitePreferences.PREF_OS_PERMISSIONS_WARNING_EXTRA);
+            osWarningExtra.setKey(SingleWebsiteSettings.PREF_OS_PERMISSIONS_WARNING_EXTRA);
             screen.addPreference(osWarningExtra);
         }
     }

chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java → chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java

@@ -45,9 +45,9 @@ import java.util.Set;
 /**
  * Shows the permissions and other settings for a particular website.
  */
-public class SingleWebsitePreferences extends PreferenceFragmentCompat
+public class SingleWebsiteSettings extends PreferenceFragmentCompat
         implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
-    // SingleWebsitePreferences expects either EXTRA_SITE (a Website) or
+    // SingleWebsiteSettings expects either EXTRA_SITE (a Website) or
     // EXTRA_SITE_ADDRESS (a WebsiteAddress) to be present (but not both). If
     // EXTRA_SITE is present, the fragment will display the permissions in that
     // Website object. If EXTRA_SITE_ADDRESS is present, the fragment will find all
@@ -241,12 +241,11 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat
                     type++) {
                 if (merged.getPermissionInfo(type) == null && other.getPermissionInfo(type) != null
                         && permissionInfoIsForTopLevelOrigin(
-                                   other.getPermissionInfo(type), origin)) {
+                                other.getPermissionInfo(type), origin)) {
                     merged.setPermissionInfo(other.getPermissionInfo(type));
                 }
             }
-            if (merged.getLocalStorageInfo() == null
-                    && other.getLocalStorageInfo() != null
+            if (merged.getLocalStorageInfo() == null && other.getLocalStorageInfo() != null
                     && origin.equals(other.getLocalStorageInfo().getOrigin())) {
                 merged.setLocalStorageInfo(other.getLocalStorageInfo());
             }
@@ -436,8 +435,8 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat
             if (managedBy != null) {
                 final Intent notificationSettingsIntent =
                         getNotificationSettingsIntent(manager.getDelegatePackageName(origin));
-                String summaryText = getString(R.string.website_notification_managed_by_app,
-                        managedBy);
+                String summaryText =
+                        getString(R.string.website_notification_managed_by_app, managedBy);
                 ChromeImageViewPreference newPreference =
                         replaceWithReadOnlyCopyOf(preference, summaryText);
                 setupNotificationManagedByPreference(newPreference, notificationSettingsIntent);
@@ -669,7 +668,7 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat
                 return mSite.getPermission(i) == null
                         ? false
                         : SiteSettingsCategory.createFromType(type).showPermissionBlockedMessage(
-                                  getActivity());
+                                getActivity());
             }
         }
         return false;
@@ -846,7 +845,7 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat
                 return i < ContentSettingException.Type.NUM_ENTRIES
                         ? ContentSettingException.getContentSettingsType(i)
                         : PermissionInfo.getContentSettingsType(
-                                  i - ContentSettingException.Type.NUM_ENTRIES);
+                                i - ContentSettingException.Type.NUM_ENTRIES);
             }
         }
         return 0;

chrome/android/java/src/org/chromium/chrome/browser/settings/website/SiteSettingsPreferences.java → chrome/android/java/src/org/chromium/chrome/browser/settings/website/SiteSettings.java

@@ -27,7 +27,7 @@ import java.util.List;
  * permissions that have been granted to websites, as well as enable or disable permissions
  * browser-wide.
  */
-public class SiteSettingsPreferences
+public class SiteSettings
         extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener {
     // The keys for each category shown on the Site Settings page
     // are defined in the SiteSettingsCategory.
@@ -167,9 +167,9 @@ public class SiteSettingsPreferences
     @Override
     public boolean onPreferenceClick(Preference preference) {
         preference.getExtras().putString(
-                SingleCategoryPreferences.EXTRA_CATEGORY, preference.getKey());
-        preference.getExtras().putString(SingleCategoryPreferences.EXTRA_TITLE,
-                preference.getTitle().toString());
+                SingleCategorySettings.EXTRA_CATEGORY, preference.getKey());
+        preference.getExtras().putString(
+                SingleCategorySettings.EXTRA_TITLE, preference.getTitle().toString());
         return false;
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPreferencesUiTest.java

@@ -23,8 +23,8 @@ import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.settings.ChromeImageViewPreference;
 import org.chromium.chrome.browser.settings.ExpandablePreferenceGroup;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.settings.website.SingleCategoryPreferences;
-import org.chromium.chrome.browser.settings.website.SingleWebsitePreferences;
+import org.chromium.chrome.browser.settings.website.SingleCategorySettings;
+import org.chromium.chrome.browser.settings.website.SingleWebsiteSettings;
 import org.chromium.chrome.browser.settings.website.SiteSettingsCategory;
 import org.chromium.chrome.browser.settings.website.SiteSettingsTestUtils;
 import org.chromium.chrome.browser.settings.website.Website;
@@ -78,10 +78,10 @@ public class TrustedWebActivityPreferencesUiTest {
                 SiteSettingsCategory.Type.NOTIFICATIONS);
         final String groupName = "managed_group";
 
-        final SingleCategoryPreferences websitePreferences =
+        final SingleCategorySettings websitePreferences =
                 TestThreadUtils.runOnUiThreadBlocking(() -> {
-                    final SingleCategoryPreferences preferences =
-                            (SingleCategoryPreferences) settingsActivity.getMainFragment();
+                    final SingleCategorySettings preferences =
+                            (SingleCategorySettings) settingsActivity.getMainFragment();
                     final ExpandablePreferenceGroup group =
                             (ExpandablePreferenceGroup) preferences.findPreference(groupName);
                     preferences.onPreferenceClick(group);
@@ -133,8 +133,8 @@ public class TrustedWebActivityPreferencesUiTest {
                 SiteSettingsTestUtils.startSingleWebsitePreferences(website);
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            final SingleWebsitePreferences websitePreferences =
-                    (SingleWebsitePreferences) settingsActivity.getMainFragment();
+            final SingleWebsiteSettings websitePreferences =
+                    (SingleWebsiteSettings) settingsActivity.getMainFragment();
             final ChromeImageViewPreference notificationPreference =
                     (ChromeImageViewPreference) websitePreferences.findPreference(
                             "push_notifications_list");

chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeIntentTest.java

@@ -23,8 +23,8 @@ import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.settings.website.SingleCategoryPreferences;
-import org.chromium.chrome.browser.settings.website.SingleWebsitePreferences;
+import org.chromium.chrome.browser.settings.website.SingleCategorySettings;
+import org.chromium.chrome.browser.settings.website.SingleWebsiteSettings;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.ActivityUtils;
 import org.chromium.content_public.browser.test.util.Criteria;
@@ -81,9 +81,9 @@ public class NotificationPlatformBridgeIntentTest {
                 });
         Assert.assertNotNull("Could not find the Settings activity", activity);
 
-        SingleCategoryPreferences fragment =
-                ActivityUtils.waitForFragmentToAttach(activity, SingleCategoryPreferences.class);
-        Assert.assertNotNull("Could not find the SingleCategoryPreferences fragment", fragment);
+        SingleCategorySettings fragment =
+                ActivityUtils.waitForFragmentToAttach(activity, SingleCategorySettings.class);
+        Assert.assertNotNull("Could not find the SingleCategorySettings fragment", fragment);
     }
 
     /**
@@ -121,9 +121,9 @@ public class NotificationPlatformBridgeIntentTest {
                 });
         Assert.assertNotNull("Could not find the Settings activity", activity);
 
-        SingleWebsitePreferences fragment =
-                ActivityUtils.waitForFragmentToAttach(activity, SingleWebsitePreferences.class);
-        Assert.assertNotNull("Could not find the SingleWebsitePreferences fragment", fragment);
+        SingleWebsiteSettings fragment =
+                ActivityUtils.waitForFragmentToAttach(activity, SingleWebsiteSettings.class);
+        Assert.assertNotNull("Could not find the SingleWebsiteSettings fragment", fragment);
     }
 
     /**

chrome/android/javatests/src/org/chromium/chrome/browser/settings/notifications/NotificationsSettingsTest.java

@@ -27,7 +27,7 @@ import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
 import org.chromium.chrome.browser.settings.SettingsActivity;
 import org.chromium.chrome.browser.settings.SettingsActivityTest;
 import org.chromium.chrome.browser.settings.website.ContentSettingsResources;
-import org.chromium.chrome.browser.settings.website.SingleCategoryPreferences;
+import org.chromium.chrome.browser.settings.website.SingleCategorySettings;
 import org.chromium.chrome.browser.settings.website.SiteSettingsCategory;
 import org.chromium.chrome.browser.settings.website.WebsitePreferenceBridge;
 import org.chromium.chrome.browser.test.ScreenShooter;
@@ -134,11 +134,11 @@ public class NotificationsSettingsTest {
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
-                return getTopFragment() instanceof SingleCategoryPreferences;
+                return getTopFragment() instanceof SingleCategorySettings;
             }
         });
 
-        SingleCategoryPreferences fragment = (SingleCategoryPreferences) getTopFragment();
+        SingleCategorySettings fragment = (SingleCategorySettings) getTopFragment();
         Assert.assertTrue(
                 fragment.getCategoryForTest().showSites(SiteSettingsCategory.Type.NOTIFICATIONS));
 

chrome/android/javatests/src/org/chromium/chrome/browser/settings/website/SiteSettingsPreferencesTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/settings/website/SiteSettingsTest.java

@@ -60,7 +60,7 @@ import java.util.concurrent.Callable;
         ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
         ContentSwitches.HOST_RESOLVER_RULES + "=MAP * 127.0.0.1",
 })
-public class SiteSettingsPreferencesTest {
+public class SiteSettingsTest {
     @Rule
     public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
             new ChromeActivityTestRule<>(ChromeActivity.class);
@@ -84,11 +84,11 @@ public class SiteSettingsPreferencesTest {
                 SiteSettingsCategory.Type.DEVICE_LOCATION);
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            SingleCategoryPreferences websitePreferences =
-                    (SingleCategoryPreferences) settingsActivity.getMainFragment();
+            SingleCategorySettings websitePreferences =
+                    (SingleCategorySettings) settingsActivity.getMainFragment();
             ChromeSwitchPreference location =
                     (ChromeSwitchPreference) websitePreferences.findPreference(
-                            SingleCategoryPreferences.BINARY_TOGGLE_KEY);
+                            SingleCategorySettings.BINARY_TOGGLE_KEY);
 
             websitePreferences.onPreferenceChange(location, enabled);
             Assert.assertEquals("Location should be " + (enabled ? "allowed" : "blocked"), enabled,
@@ -155,14 +155,14 @@ public class SiteSettingsPreferencesTest {
         TestThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                final SingleCategoryPreferences websitePreferences =
-                        (SingleCategoryPreferences) settingsActivity.getMainFragment();
+                final SingleCategorySettings websitePreferences =
+                        (SingleCategorySettings) settingsActivity.getMainFragment();
                 final ChromeSwitchPreference cookies =
                         (ChromeSwitchPreference) websitePreferences.findPreference(
-                                SingleCategoryPreferences.BINARY_TOGGLE_KEY);
+                                SingleCategorySettings.BINARY_TOGGLE_KEY);
                 final ChromeBaseCheckBoxPreference thirdPartyCookies =
                         (ChromeBaseCheckBoxPreference) websitePreferences.findPreference(
-                                SingleCategoryPreferences.THIRD_PARTY_COOKIES_TOGGLE_KEY);
+                                SingleCategorySettings.THIRD_PARTY_COOKIES_TOGGLE_KEY);
 
                 if (thirdPartyCookies != null) {
                     Assert.assertEquals("Third-party cookie toggle should be "
@@ -185,8 +185,8 @@ public class SiteSettingsPreferencesTest {
         TestThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                final SingleCategoryPreferences websitePreferences =
-                        (SingleCategoryPreferences) settingsActivity.getMainFragment();
+                final SingleCategorySettings websitePreferences =
+                        (SingleCategorySettings) settingsActivity.getMainFragment();
 
                 Assert.assertTrue(doesAcceptCookies());
                 if (thirdPartiesOnly) {
@@ -211,11 +211,11 @@ public class SiteSettingsPreferencesTest {
     private void setThirdPartyCookiesEnabled(
             final SettingsActivity settingsActivity, final boolean enabled) {
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            final SingleCategoryPreferences websitePreferences =
-                    (SingleCategoryPreferences) settingsActivity.getMainFragment();
+            final SingleCategorySettings websitePreferences =
+                    (SingleCategorySettings) settingsActivity.getMainFragment();
             final ChromeBaseCheckBoxPreference thirdPartyCookies =
                     (ChromeBaseCheckBoxPreference) websitePreferences.findPreference(
-                            SingleCategoryPreferences.THIRD_PARTY_COOKIES_TOGGLE_KEY);
+                            SingleCategorySettings.THIRD_PARTY_COOKIES_TOGGLE_KEY);
 
             websitePreferences.onPreferenceChange(thirdPartyCookies, enabled);
             Assert.assertEquals(
@@ -231,10 +231,10 @@ public class SiteSettingsPreferencesTest {
                 SiteSettingsTestUtils.startSiteSettingsCategory(type);
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            SingleCategoryPreferences preferences =
-                    (SingleCategoryPreferences) settingsActivity.getMainFragment();
+            SingleCategorySettings preferences =
+                    (SingleCategorySettings) settingsActivity.getMainFragment();
             ChromeSwitchPreference toggle = (ChromeSwitchPreference) preferences.findPreference(
-                    SingleCategoryPreferences.BINARY_TOGGLE_KEY);
+                    SingleCategorySettings.BINARY_TOGGLE_KEY);
             preferences.onPreferenceChange(toggle, enabled);
         });
         settingsActivity.finish();
@@ -246,11 +246,11 @@ public class SiteSettingsPreferencesTest {
                 SiteSettingsTestUtils.startSiteSettingsCategory(type);
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            SingleCategoryPreferences preferences =
-                    (SingleCategoryPreferences) settingsActivity.getMainFragment();
+            SingleCategorySettings preferences =
+                    (SingleCategorySettings) settingsActivity.getMainFragment();
             TriStateSiteSettingsPreference triStateToggle =
                     (TriStateSiteSettingsPreference) preferences.findPreference(
-                            SingleCategoryPreferences.TRI_STATE_TOGGLE_KEY);
+                            SingleCategorySettings.TRI_STATE_TOGGLE_KEY);
             preferences.onPreferenceChange(triStateToggle, newValue);
         });
         settingsActivity.finish();
@@ -463,8 +463,8 @@ public class SiteSettingsPreferencesTest {
         final SettingsActivity settingsActivity =
                 SiteSettingsTestUtils.startSingleWebsitePreferences(website);
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            SingleWebsitePreferences websitePreferences =
-                    (SingleWebsitePreferences) settingsActivity.getMainFragment();
+            SingleWebsiteSettings websitePreferences =
+                    (SingleWebsiteSettings) settingsActivity.getMainFragment();
             websitePreferences.resetSite();
         });
         settingsActivity.finish();
@@ -622,7 +622,7 @@ public class SiteSettingsPreferencesTest {
     }
 
     /**
-     * Tests that {@link SingleWebsitePreferences#resetSite} doesn't crash
+     * Tests that {@link SingleWebsiteSettings#resetSite} doesn't crash
      * (see e.g. the crash on host names in issue 600232).
      */
     @Test

chrome/android/javatests/src/org/chromium/chrome/browser/settings/website/SiteSettingsTestUtils.java

@@ -17,9 +17,9 @@ import org.chromium.chrome.browser.settings.SettingsLauncher;
 public class SiteSettingsTestUtils {
     public static SettingsActivity startSiteSettingsMenu(String category) {
         Bundle fragmentArgs = new Bundle();
-        fragmentArgs.putString(SingleCategoryPreferences.EXTRA_CATEGORY, category);
+        fragmentArgs.putString(SingleCategorySettings.EXTRA_CATEGORY, category);
         Intent intent = SettingsLauncher.createIntentForSettingsPage(
-                InstrumentationRegistry.getTargetContext(), SiteSettingsPreferences.class.getName(),
+                InstrumentationRegistry.getTargetContext(), SiteSettings.class.getName(),
                 fragmentArgs);
         return (SettingsActivity) InstrumentationRegistry.getInstrumentation().startActivitySync(
                 intent);
@@ -28,20 +28,20 @@ public class SiteSettingsTestUtils {
     public static SettingsActivity startSiteSettingsCategory(@SiteSettingsCategory.Type int type) {
         Bundle fragmentArgs = new Bundle();
         fragmentArgs.putString(
-                SingleCategoryPreferences.EXTRA_CATEGORY, SiteSettingsCategory.preferenceKey(type));
+                SingleCategorySettings.EXTRA_CATEGORY, SiteSettingsCategory.preferenceKey(type));
         Intent intent = SettingsLauncher.createIntentForSettingsPage(
-                InstrumentationRegistry.getTargetContext(),
-                SingleCategoryPreferences.class.getName(), fragmentArgs);
+                InstrumentationRegistry.getTargetContext(), SingleCategorySettings.class.getName(),
+                fragmentArgs);
         return (SettingsActivity) InstrumentationRegistry.getInstrumentation().startActivitySync(
                 intent);
     }
 
     public static SettingsActivity startSingleWebsitePreferences(Website site) {
         Bundle fragmentArgs = new Bundle();
-        fragmentArgs.putSerializable(SingleWebsitePreferences.EXTRA_SITE, site);
+        fragmentArgs.putSerializable(SingleWebsiteSettings.EXTRA_SITE, site);
         Intent intent = SettingsLauncher.createIntentForSettingsPage(
-                InstrumentationRegistry.getTargetContext(),
-                SingleWebsitePreferences.class.getName(), fragmentArgs);
+                InstrumentationRegistry.getTargetContext(), SingleWebsiteSettings.class.getName(),
+                fragmentArgs);
         return (SettingsActivity) InstrumentationRegistry.getInstrumentation().startActivitySync(
                 intent);
     }

chrome/android/javatests/src/org/chromium/chrome/browser/vr/VrBrowserTransitionTest.java

@@ -39,7 +39,7 @@ import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.ntp.IncognitoNewTabPage;
 import org.chromium.chrome.browser.settings.SettingsActivity;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.website.SingleWebsitePreferences;
+import org.chromium.chrome.browser.settings.website.SingleWebsiteSettings;
 import org.chromium.chrome.browser.util.UrlConstants;
 import org.chromium.chrome.browser.vr.mock.MockVrDaydreamApi;
 import org.chromium.chrome.browser.vr.rules.ChromeTabbedActivityVrTestRule;
@@ -376,7 +376,7 @@ public class VrBrowserTransitionTest {
         NativeUiUtils.enableMockedInput();
         NativeUiUtils.performActionAndWaitForUiQuiescence(() -> {
             TestThreadUtils.runOnUiThreadBlocking(() -> {
-                SettingsLauncher.launchSettingsPage(context, SingleWebsitePreferences.class);
+                SettingsLauncher.launchSettingsPage(context, SingleWebsiteSettings.class);
             });
         });
         TestThreadUtils.runOnUiThreadBlocking(
@@ -421,7 +421,7 @@ public class VrBrowserTransitionTest {
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             Intent preferencesIntent = SettingsLauncher.createIntentForSettingsPage(
-                    context, SingleWebsitePreferences.class.getName());
+                    context, SingleWebsiteSettings.class.getName());
             Assert.assertFalse("Starting an activity did not trigger DOFF",
                     context.startActivityIfNeeded(preferencesIntent, 0));
         });