Start using the whitelist icon on the NTP.

chrome/browser/android/most_visited_sites.cc

Index: chrome/browser/android/most_visited_sites.cc
diff --git a/chrome/browser/android/most_visited_sites.cc b/chrome/browser/android/most_visited_sites.cc
index a41f6c83c7c456fd3c7d41653259aa6e1a236c4f..3d3cca141c97aff2e33aae139dd4899ff0c977a5 100644
--- a/chrome/browser/android/most_visited_sites.cc
+++ b/chrome/browser/android/most_visited_sites.cc
@@ -167,18 +167,41 @@ bool NeedPopularSites(const PrefService* prefs, size_t num_tiles) {
 MostVisitedSites::Suggestion::Suggestion(const base::string16& title,
                                          const std::string& url,
                                          MostVisitedSource source)
-    : title(title), url(url), source(source), provider_index(-1) {}
+    : title(title),
+      url(url),
+      local_large_icon_path(base::FilePath()),

[Marc Treib, 2016/03/08 14:27:12]

This is unnecessary, also below

[atanasova, 2016/03/08 15:53:58]

Done.

+      source(source),
+      provider_index(-1) {}
+
+MostVisitedSites::Suggestion::Suggestion(
+    const base::string16& title,
+    const GURL& url,
+    const base::FilePath& local_large_icon_path,
+    MostVisitedSource source)
+    : title(title),
+      url(url),
+      local_large_icon_path(local_large_icon_path),
+      source(source),
+      provider_index(-1) {}
 
 MostVisitedSites::Suggestion::Suggestion(const base::string16& title,
                                          const GURL& url,
                                          MostVisitedSource source)
-    : title(title), url(url), source(source), provider_index(-1) {}
+    : title(title),
+      url(url),
+      local_large_icon_path(base::FilePath()),
+      source(source),
+      provider_index(-1) {}
 
 MostVisitedSites::Suggestion::Suggestion(const base::string16& title,
                                          const std::string& url,
                                          MostVisitedSource source,
                                          int provider_index)
-    : title(title), url(url), source(source), provider_index(provider_index) {
+    : title(title),
+      url(url),
+      local_large_icon_path(base::FilePath()),
+      source(source),
+      provider_index(provider_index) {
   DCHECK_EQ(MostVisitedSites::SUGGESTIONS_SERVICE, source);
 }
 
@@ -572,8 +595,9 @@ MostVisitedSites::CreateWhitelistEntryPointSuggestions(
       continue;
     }
 
-    whitelist_suggestions.push_back(make_scoped_ptr(new Suggestion(
-        whitelist->title(), whitelist->entry_point(), WHITELIST)));
+    whitelist_suggestions.push_back(make_scoped_ptr(
+        new Suggestion(whitelist->title(), whitelist->entry_point(),
+                       whitelist->large_icon_path(), WHITELIST)));
     if (whitelist_suggestions.size() >= num_whitelist_suggestions)
       break;
   }
@@ -802,17 +826,20 @@ void MostVisitedSites::NotifyMostVisitedURLsObserver() {
   }
   std::vector<base::string16> titles;
   std::vector<std::string> urls;
+  std::vector<std::string> local_icon_paths;
   titles.reserve(num_suggestions);
   urls.reserve(num_suggestions);
   for (const auto& suggestion : current_suggestions_) {
     titles.push_back(suggestion->title);
     urls.push_back(suggestion->url.spec());
+    local_icon_paths.push_back(suggestion->local_large_icon_path.value());
   }
   JNIEnv* env = AttachCurrentThread();
   DCHECK_EQ(titles.size(), urls.size());
   Java_MostVisitedURLsObserver_onMostVisitedURLsAvailable(
       env, observer_.obj(), ToJavaArrayOfStrings(env, titles).obj(),
-      ToJavaArrayOfStrings(env, urls).obj());
+      ToJavaArrayOfStrings(env, urls).obj(),
+      ToJavaArrayOfStrings(env, local_icon_paths).obj());
 }
 
 void MostVisitedSites::OnPopularSitesAvailable(bool success) {