[Project Code Inclusion] Remove use of blacklist

Replace uses of "blacklistDomains" with "excludedDomains". This matches
the terminology already used on the C++ side of the bridge.

Bug: 1149433
Change-Id: If9addd57f589613d1094c3d1dc4c8848f32fe85b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2541064
Auto-Submit: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828315}

chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java

@@ -105,19 +105,19 @@ public final class BrowsingDataBridge {
      * @param dataTypes An array of browsing data types to delete, represented as values from
      *                  the shared enum {@link BrowsingDataType}.
      * @param timePeriod The time period for which to delete the data.
-     * @param blacklistDomains A list of registerable domains that we don't clear data for.
-     * @param blacklistedDomainReasons A list of the reason metadata for the blacklisted domains.
-     * @param ignoredDomains A list of ignored domains that the user chose to not blacklist. We use
+     * @param excludedDomains A list of registerable domains that we don't clear data for.
+     * @param excludedDomainReasons A list of the reason metadata for the excluded domains.
+     * @param ignoredDomains A list of ignored domains that the user chose to not exclude. We use
      *                       these to remove important site entries if the user ignores them enough.
      * @param ignoredDomainReasons A list of reason metadata for the ignored domains.
      */
     public void clearBrowsingDataExcludingDomains(OnClearBrowsingDataListener listener,
-            int[] dataTypes, @TimePeriod int timePeriod, String[] blacklistDomains,
-            int[] blacklistedDomainReasons, String[] ignoredDomains, int[] ignoredDomainReasons) {
+            int[] dataTypes, @TimePeriod int timePeriod, String[] excludedDomains,
+            int[] excludedDomainReasons, String[] ignoredDomains, int[] ignoredDomainReasons) {
         assert mClearBrowsingDataListener == null;
         mClearBrowsingDataListener = listener;
         BrowsingDataBridgeJni.get().clearBrowsingData(BrowsingDataBridge.this, getProfile(),
-                dataTypes, timePeriod, blacklistDomains, blacklistedDomainReasons, ignoredDomains,
+                dataTypes, timePeriod, excludedDomains, excludedDomainReasons, ignoredDomains,
                 ignoredDomainReasons);
     }
 
@@ -251,7 +251,7 @@ public final class BrowsingDataBridge {
     @NativeMethods
     interface Natives {
         void clearBrowsingData(BrowsingDataBridge caller, Profile profile, int[] dataTypes,
-                int timePeriod, String[] blacklistDomains, int[] blacklistedDomainReasons,
+                int timePeriod, String[] excludedDomains, int[] excludedDomainReasons,
                 String[] ignoredDomains, int[] ignoredDomainReasons);
         void requestInfoAboutOtherFormsOfBrowsingHistory(BrowsingDataBridge caller, Profile profile,
                 OtherFormsOfBrowsingHistoryListener listener);

chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java

@@ -318,8 +318,8 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
      * Requests the browsing data corresponding to the given dialog options to be deleted.
      * @param options The dialog options whose corresponding data should be deleted.
      */
-    private void clearBrowsingData(Set<Integer> options, @Nullable String[] blacklistedDomains,
-            @Nullable int[] blacklistedDomainReasons, @Nullable String[] ignoredDomains,
+    private void clearBrowsingData(Set<Integer> options, @Nullable String[] excludedDomains,
+            @Nullable int[] excludedDomainReasons, @Nullable String[] ignoredDomains,
             @Nullable int[] ignoredDomainReasons) {
         onClearBrowsingData();
         showProgressDialog();
@@ -351,9 +351,9 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
         int timePeriod = ((TimePeriodSpinnerOption) spinnerSelection).getTimePeriod();
         // TODO(bsazonov): Change integerListToIntArray to handle Collection<Integer>.
         int[] dataTypesArray = CollectionUtil.integerListToIntArray(new ArrayList<>(dataTypes));
-        if (blacklistedDomains != null && blacklistedDomains.length != 0) {
+        if (excludedDomains != null && excludedDomains.length != 0) {
             BrowsingDataBridge.getInstance().clearBrowsingDataExcludingDomains(this, dataTypesArray,
-                    timePeriod, blacklistedDomains, blacklistedDomainReasons, ignoredDomains,
+                    timePeriod, excludedDomains, excludedDomainReasons, ignoredDomains,
                     ignoredDomainReasons);
         } else {
             BrowsingDataBridge.getInstance().clearBrowsingData(this, dataTypesArray, timePeriod);