Start using the whitelist icon on the NTP.

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 33fdca54eeb2d1351652a93f709cf571f9a64efe..1d25af14bf7b2a92cfa78a7f3873006ee115e05f 100644
--- a/chrome/browser/android/most_visited_sites.h
+++ b/chrome/browser/android/most_visited_sites.h
@@ -13,6 +13,7 @@
 
 #include "base/android/scoped_java_ref.h"
 #include "base/compiler_specific.h"
+#include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -79,9 +80,6 @@ class MostVisitedSites : public sync_driver::SyncServiceObserver,
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
- private:
-  friend class MostVisitedSitesTest;
-
   // The source of the Most Visited sites.

[Marc Treib, 2016/03/16 11:06:03]

All this is now public only so that the Builder can access it, right?
If so, I'd make the Builder a member (you can just declare it here, like
class SuggestionBuilder;
i.e. no need to move the definition here), and keep this private.

[atanasova, 2016/03/16 17:58:17]

Done.

   enum MostVisitedSource { TOP_SITES, SUGGESTIONS_SERVICE, POPULAR, WHITELIST };
 
@@ -89,18 +87,17 @@ class MostVisitedSites : public sync_driver::SyncServiceObserver,
     base::string16 title;
     GURL url;
     MostVisitedSource source;
+
+    // Only valid for source == WHITELIST (empty otherwise).
+    base::FilePath whitelist_icon_path;
+
     // Only valid for source == SUGGESTIONS_SERVICE (-1 otherwise).
     int provider_index;
 
     Suggestion(const base::string16& title,
-               const std::string& url,
-               MostVisitedSource source);
-    Suggestion(const base::string16& title,
                const GURL& url,
-               MostVisitedSource source);
-    Suggestion(const base::string16& title,
-               const std::string& url,
                MostVisitedSource source,
+               const base::FilePath& whitelist_icon_path,
                int provider_index);
     ~Suggestion();
 
@@ -111,6 +108,9 @@ class MostVisitedSites : public sync_driver::SyncServiceObserver,
     DISALLOW_COPY_AND_ASSIGN(Suggestion);
   };
 
+ private:
+  friend class MostVisitedSitesTest;
+
   using SuggestionsVector = std::vector<scoped_ptr<Suggestion>>;
 
   ~MostVisitedSites() override;