[Project Code Inclusion] Remove all uses of whitelist/blacklist in...

[Project Code Inclusion] Remove all uses of whitelist/blacklist in chrome/android/.../contextualsearch

Bug: 1151331
Change-Id: I73e1bc80116e40a43071d316dd2f72d9e882ffc0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2576955
Auto-Submit: Jeffrey Cohen <jeffreycohen@chromium.org>
Commit-Queue: Donn Denman <donnd@chromium.org>
Reviewed-by: Donn Denman <donnd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834570}

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

@@ -105,8 +105,8 @@ public class ContextualSearchManager
 
     private static final String INTENT_URL_PREFIX = "intent:";
 
-    // We blacklist this URL because malformed URLs may bring up this page.
-    private static final String BLACKLISTED_URL = ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL;
+    // We denylist this URL because malformed URLs may bring up this page.
+    private static final String DENYLISTED_URL = ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL;
 
     // How long to wait for a tap near a previous tap before hiding the UI or showing a re-Tap.
     // This setting is not critical: in practice it determines how long to wait after an invalid
@@ -830,7 +830,7 @@ public class ContextualSearchManager
         mLoadedSearchUrlTimeMs = System.currentTimeMillis();
         mLastSearchRequestLoaded = mSearchRequest;
         String searchUrl = mSearchRequest.getSearchUrl();
-        ContextualSearchManagerJni.get().whitelistContextualSearchJsApiUrl(
+        ContextualSearchManagerJni.get().allowlistContextualSearchJsApiUrl(
                 mNativeContextualSearchManagerPtr, this, searchUrl);
         mSearchPanel.loadUrlInPanel(searchUrl);
         mDidStartLoadingResolvedSearchRequest = true;
@@ -1191,7 +1191,7 @@ public class ContextualSearchManager
      * @param url The URL we are navigating to.
      */
     public void onExternalNavigation(String url) {
-        if (!mDidPromoteSearchNavigation && mSearchPanel != null && !BLACKLISTED_URL.equals(url)
+        if (!mDidPromoteSearchNavigation && mSearchPanel != null && !DENYLISTED_URL.equals(url)
                 && !url.startsWith(INTENT_URL_PREFIX) && shouldPromoteSearchNavigation()) {
             // Do not promote to a regular tab if we're loading our Resolved Search
             // URL, otherwise we'll promote it when prefetching the Serp.
@@ -1936,7 +1936,7 @@ public class ContextualSearchManager
         void gatherSurroundingText(long nativeContextualSearchManager,
                 ContextualSearchManager caller, ContextualSearchContext contextualSearchContext,
                 WebContents baseWebContents);
-        void whitelistContextualSearchJsApiUrl(
+        void allowlistContextualSearchJsApiUrl(
                 long nativeContextualSearchManager, ContextualSearchManager caller, String url);
         void enableContextualSearchJsApiForWebContents(long nativeContextualSearchManager,
                 ContextualSearchManager caller, WebContents overlayWebContents);

chrome/browser/android/contextualsearch/contextual_search_manager.cc

@@ -168,7 +168,7 @@ void ContextualSearchManager::EnableContextualSearchJsApiForWebContents(
       overlay_web_contents, this);
 }
 
-void ContextualSearchManager::WhitelistContextualSearchJsApiUrl(
+void ContextualSearchManager::AllowlistContextualSearchJsApiUrl(
     JNIEnv* env,
     jobject obj,
     const base::android::JavaParamRef<jstring>& j_url) {

chrome/browser/android/contextualsearch/contextual_search_manager.h

@@ -48,14 +48,14 @@ class ContextualSearchManager
       const base::android::JavaParamRef<jobject>& j_contextual_search_context,
       const base::android::JavaParamRef<jobject>& j_base_web_contents);
 
-  // Whitelists the given |j_url| for injection of the Contextual Search
+  // Allowlists the given |j_url| for injection of the Contextual Search
   // JavaScript API.  EnableContextualSearchJsApiForWebContents must also be
   // called with the WebContents that will host the page in the Overlay.
   // This method should be called when the URL navigation starts so the
   // JavaScript API can be established before the page executes.
   // The given URL is stored for future reference when ShouldEnableJsApi is
   // called by a Renderer through mojo.
-  void WhitelistContextualSearchJsApiUrl(
+  void AllowlistContextualSearchJsApiUrl(
       JNIEnv* env,
       jobject obj,
       const base::android::JavaParamRef<jstring>& j_url);
@@ -64,7 +64,7 @@ class ContextualSearchManager
   // This method should be called at least once for this Overlay Panel, and
   // before any page loads in the Overlay so that the Contextual Search
   // JavaScript API can be injected into the Overlay Panel.
-  // WhitelistContextualSearchJsApiUrl must also be called for every URL
+  // AllowlistContextualSearchJsApiUrl must also be called for every URL
   // that will be loaded, in order for the JavaScript API to be enabled for that
   // URL.
   void EnableContextualSearchJsApiForWebContents(