Use whitelist large icon for corresponding most visited suggestions.

chrome/browser/android/most_visited_sites.h

Index: chrome/browser/android/most_visited_sites.h
diff --git a/chrome/browser/android/most_visited_sites.h b/chrome/browser/android/most_visited_sites.h
index 4a44b6badbd079d72ef855b09e766dc7bacb729b..6a74f01c85611f3cd188bd8814e3cd6bdcc447c1 100644
--- a/chrome/browser/android/most_visited_sites.h
+++ b/chrome/browser/android/most_visited_sites.h
@@ -90,24 +90,27 @@ class MostVisitedSites : public sync_driver::SyncServiceObserver,
     base::string16 title;
     GURL url;
     MostVisitedSource source;
-    // Only valid for source == WHITELIST (empty otherwise).
+    // Will be empty for entries that do not have a whitelist associated with

[Marc Treib, 2016/03/11 14:21:01]

nit: "that don't have an associated whitelist", then it should fit on one line
:)

[atanasova, 2016/03/11 15:59:25]

Done.

+    // them.
     base::FilePath large_icon_path;
     // Only valid for source == SUGGESTIONS_SERVICE (-1 otherwise).
     int provider_index;
 
     Suggestion(const base::string16& title,
-               const std::string& url,
+               const GURL& url,
                MostVisitedSource source);
     Suggestion(const base::string16& title,
-               const GURL& url,
+               const std::string& url,
                MostVisitedSource source,
                const base::FilePath& large_icon_path);
     Suggestion(const base::string16& title,
                const GURL& url,
-               MostVisitedSource source);
+               MostVisitedSource source,
+               const base::FilePath& large_icon_path);
     Suggestion(const base::string16& title,
                const std::string& url,
                MostVisitedSource source,
+               const base::FilePath& large_icon_path,
                int provider_index);
     ~Suggestion();
 
@@ -127,6 +130,9 @@ class MostVisitedSites : public sync_driver::SyncServiceObserver,
   // enabled, or if it returns no data.
   void InitiateTopSitesQuery();
 
+  // If there is a whitelist entry point for the URL return the large icon path
+  base::FilePath GetWhitelistLargeIconPath(const GURL& url);
+
   // Callback for when data is available from TopSites.
   void OnMostVisitedURLsAvailable(
       const history::MostVisitedURLList& visited_list);