ntp_tiles: cleans up some terms in ntp_tiles

There is a bunch more work to be done here, but this makes the
code match that of the names in history.

BUG=1104873
TEST=none

Change-Id: Ib11d1a2335e1c8ee6643b1f5e58d5807dd66a788
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340547Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795683}

chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java

@@ -64,16 +64,14 @@ public class MostVisitedSitesBridge implements MostVisitedSites {
     @Override
     public void addBlocklistedUrl(String url) {
         if (mNativeMostVisitedSitesBridge == 0) return;
-        // TODO(crbug.com/1102812): Change the native C++ method name.
-        MostVisitedSitesBridgeJni.get().addOrRemoveBlacklistedUrl(
+        MostVisitedSitesBridgeJni.get().addOrRemoveBlockedUrl(
                 mNativeMostVisitedSitesBridge, MostVisitedSitesBridge.this, url, true);
     }
 
     @Override
     public void removeBlocklistedUrl(String url) {
         if (mNativeMostVisitedSitesBridge == 0) return;
-        // TODO(crbug.com/1102812): Change the native C++ method name.
-        MostVisitedSitesBridgeJni.get().addOrRemoveBlacklistedUrl(
+        MostVisitedSitesBridgeJni.get().addOrRemoveBlockedUrl(
                 mNativeMostVisitedSitesBridge, MostVisitedSitesBridge.this, url, false);
     }
 
@@ -167,8 +165,8 @@ public class MostVisitedSitesBridge implements MostVisitedSites {
                 MostVisitedSites.HomepageClient homePageClient);
         void setObserver(long nativeMostVisitedSitesBridge, MostVisitedSitesBridge caller,
                 MostVisitedSitesBridge observer, int numSites);
-        void addOrRemoveBlacklistedUrl(long nativeMostVisitedSitesBridge,
-                MostVisitedSitesBridge caller, String url, boolean addUrl);
+        void addOrRemoveBlockedUrl(long nativeMostVisitedSitesBridge, MostVisitedSitesBridge caller,
+                String url, boolean addUrl);
         void recordPageImpression(
                 long nativeMostVisitedSitesBridge, MostVisitedSitesBridge caller, int tilesCount);
         void recordTileImpression(long nativeMostVisitedSitesBridge, MostVisitedSitesBridge caller,

chrome/browser/android/ntp/most_visited_sites_bridge.cc

@@ -222,13 +222,13 @@ void MostVisitedSitesBridge::SetObserver(
   most_visited_->SetMostVisitedURLsObserver(java_observer_.get(), num_sites);
 }
 
-void MostVisitedSitesBridge::AddOrRemoveBlacklistedUrl(
+void MostVisitedSitesBridge::AddOrRemoveBlockedUrl(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_url,
     jboolean add_url) {
   GURL url(ConvertJavaStringToUTF8(env, j_url));
-  most_visited_->AddOrRemoveBlacklistedUrl(url, add_url);
+  most_visited_->AddOrRemoveBlockedUrl(url, add_url);
 }
 
 void MostVisitedSitesBridge::RecordPageImpression(

chrome/browser/android/ntp/most_visited_sites_bridge.h

@@ -37,11 +37,10 @@ class MostVisitedSitesBridge {
                          const base::android::JavaParamRef<jobject>& obj,
                          const base::android::JavaParamRef<jobject>& j_client);
 
-  void AddOrRemoveBlacklistedUrl(
-      JNIEnv* env,
-      const base::android::JavaParamRef<jobject>& obj,
-      const base::android::JavaParamRef<jstring>& j_url,
-      jboolean add_url);
+  void AddOrRemoveBlockedUrl(JNIEnv* env,
+                             const base::android::JavaParamRef<jobject>& obj,
+                             const base::android::JavaParamRef<jstring>& j_url,
+                             jboolean add_url);
   void RecordPageImpression(JNIEnv* env,
                             const base::android::JavaParamRef<jobject>& obj,
                             jint jtiles_count);

chrome/browser/search/instant_service.cc

@@ -285,19 +285,19 @@ void InstantService::OnNewTabPageOpened() {
 
 void InstantService::DeleteMostVisitedItem(const GURL& url) {
   if (most_visited_sites_) {
-    most_visited_sites_->AddOrRemoveBlacklistedUrl(url, true);
+    most_visited_sites_->AddOrRemoveBlockedUrl(url, true);
   }
 }
 
 void InstantService::UndoMostVisitedDeletion(const GURL& url) {
   if (most_visited_sites_) {
-    most_visited_sites_->AddOrRemoveBlacklistedUrl(url, false);
+    most_visited_sites_->AddOrRemoveBlockedUrl(url, false);
   }
 }
 
 void InstantService::UndoAllMostVisitedDeletions() {
   if (most_visited_sites_) {
-    most_visited_sites_->ClearBlacklistedUrls();
+    most_visited_sites_->ClearBlockedUrls();
   }
 }
 

components/ntp_tiles/most_visited_sites.cc

@@ -379,8 +379,7 @@ void MostVisitedSites::UndoCustomLinkAction() {
     BuildCurrentTiles();
 }
 
-void MostVisitedSites::AddOrRemoveBlacklistedUrl(const GURL& url,
-                                                 bool add_url) {
+void MostVisitedSites::AddOrRemoveBlockedUrl(const GURL& url, bool add_url) {
   if (add_url) {
     base::RecordAction(base::UserMetricsAction("Suggestions.Site.Removed"));
   } else {
@@ -404,14 +403,13 @@ void MostVisitedSites::AddOrRemoveBlacklistedUrl(const GURL& url,
   }
 }
 
-void MostVisitedSites::ClearBlacklistedUrls() {
+void MostVisitedSites::ClearBlockedUrls() {
   if (top_sites_)
     top_sites_->ClearBlockedUrls();
 
   // Only update the server-side blocklist if it's active.
-  if (mv_source_ == TileSource::SUGGESTIONS_SERVICE) {
+  if (mv_source_ == TileSource::SUGGESTIONS_SERVICE)
     suggestions_service_->ClearBlocklist();
-  }
 }
 
 void MostVisitedSites::OnBlockedSitesChanged() {

components/ntp_tiles/most_visited_sites.h

@@ -209,8 +209,8 @@ class MostVisitedSites : public history::TopSitesObserver,
   // must be enabled.
   void UndoCustomLinkAction();
 
-  void AddOrRemoveBlacklistedUrl(const GURL& url, bool add_url);
-  void ClearBlacklistedUrls();
+  void AddOrRemoveBlockedUrl(const GURL& url, bool add_url);
+  void ClearBlockedUrls();
 
   // MostVisitedSitesSupervisor::Observer implementation.
   void OnBlockedSitesChanged() override;

components/ntp_tiles/most_visited_sites_unittest.cc

@@ -834,7 +834,7 @@ TEST_P(MostVisitedSitesTest, ShouldNotIncludeHomepageIfEmptyUrl) {
   base::RunLoop().RunUntilIdle();
 }
 
-TEST_P(MostVisitedSitesTest, ShouldNotIncludeHomepageIfBlacklisted) {
+TEST_P(MostVisitedSitesTest, ShouldNotIncludeHomepageIfBlocked) {
   FakeHomepageClient* homepage_client = RegisterNewHomepageClient();
   homepage_client->SetHomepageTileEnabled(true);
   DisableRemoteSuggestions();
@@ -860,7 +860,7 @@ TEST_P(MostVisitedSitesTest, ShouldNotIncludeHomepageIfBlacklisted) {
   base::RunLoop().RunUntilIdle();
 }
 
-TEST_P(MostVisitedSitesTest, ShouldPinHomepageAgainIfBlacklistingUndone) {
+TEST_P(MostVisitedSitesTest, ShouldPinHomepageAgainIfBlockedUndone) {
   FakeHomepageClient* homepage_client = RegisterNewHomepageClient();
   homepage_client->SetHomepageTileEnabled(true);
 
@@ -964,19 +964,19 @@ TEST_P(MostVisitedSitesTest, RemovesPersonalSiteIfExploreSitesTilePresent) {
   base::RunLoop().RunUntilIdle();
 }
 
-TEST_P(MostVisitedSitesTest, ShouldInformSuggestionSourcesWhenBlacklisting) {
+TEST_P(MostVisitedSitesTest, ShouldInformSuggestionSourcesWhenBlocked) {
   EXPECT_CALL(*mock_top_sites_, AddBlockedUrl(Eq(GURL(kHomepageUrl)))).Times(1);
   EXPECT_CALL(mock_suggestions_service_, BlocklistURL(Eq(GURL(kHomepageUrl))))
       .Times(AnyNumber());
-  most_visited_sites_->AddOrRemoveBlacklistedUrl(GURL(kHomepageUrl),
-                                                 /*add_url=*/true);
+  most_visited_sites_->AddOrRemoveBlockedUrl(GURL(kHomepageUrl),
+                                             /*add_url=*/true);
   EXPECT_CALL(*mock_top_sites_, RemoveBlockedUrl(Eq(GURL(kHomepageUrl))))
       .Times(1);
   EXPECT_CALL(mock_suggestions_service_,
               UndoBlocklistURL(Eq(GURL(kHomepageUrl))))
       .Times(AnyNumber());
-  most_visited_sites_->AddOrRemoveBlacklistedUrl(GURL(kHomepageUrl),
-                                                 /*add_url=*/false);
+  most_visited_sites_->AddOrRemoveBlockedUrl(GURL(kHomepageUrl),
+                                             /*add_url=*/false);
 }
 
 TEST_P(MostVisitedSitesTest,
@@ -2174,7 +2174,7 @@ INSTANTIATE_TEST_SUITE_P(MostVisitedSitesWithEmptyCacheTest,
 // same scope as the method itself. This tests merging popular sites with
 // personal tiles.
 // More important things out of the scope of testing presently:
-// - Removing blacklisted tiles.
+// - Removing blocked tiles.
 // - Correct host extraction from the URL.
 // - Ensuring personal tiles are not duplicated in popular tiles.
 TEST(MostVisitedSitesMergeTest, ShouldMergeTilesWithPersonalOnly) {

ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm

@@ -225,12 +225,12 @@ const NSInteger kMaxNumMostVisitedTiles = 4;
 }
 
 - (void)blockMostVisitedURL:(GURL)URL {
-  _mostVisitedSites->AddOrRemoveBlacklistedUrl(URL, true);
+  _mostVisitedSites->AddOrRemoveBlockedUrl(URL, true);
   [self useFreshMostVisited];
 }
 
 - (void)allowMostVisitedURL:(GURL)URL {
-  _mostVisitedSites->AddOrRemoveBlacklistedUrl(URL, false);
+  _mostVisitedSites->AddOrRemoveBlockedUrl(URL, false);
   [self useFreshMostVisited];
 }