Start using the whitelist icon on the NTP.

chrome/browser/android/most_visited_sites.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_ANDROID_MOST_VISITED_SITES_H_
 #define CHROME_BROWSER_ANDROID_MOST_VISITED_SITES_H_
 
 #include <jni.h>
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #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"
 #include "base/scoped_observer.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites_observer.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "components/sync_driver/sync_service_observer.h"
@@ skipping 46 matching lines @@
   void OnStateChanged() override;
 
   // SupervisedUserServiceObserver implementation.
   void OnURLFilterChanged() override;
 
   // Registers JNI methods.
   static bool Register(JNIEnv* env);
 
   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 };
 
   struct Suggestion {

[Bernhard Bauer, 2016/03/16 12:14:18]

Actually, now that I see this: If this is a struct, i.e. all the members are
public anyway, you could just create an empty one and then modify the members
(in particular if you're doing that from the implementation of this class
anyway). You're not really doing much different with the builder anyway. Sorry
for jumping around here!

[Marc Treib, 2016/03/16 12:51:35]

Huh. Or, alternatively, make it a class!

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

Done.

     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();
 
     // Get the Histogram name associated with the source.
     std::string GetSourceHistogramName() const;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Suggestion);
   };
 
+ private:
+  friend class MostVisitedSitesTest;
+
   using SuggestionsVector = std::vector<scoped_ptr<Suggestion>>;
 
   ~MostVisitedSites() override;
   void QueryMostVisitedURLs();
 
   // Initialize the query to Top Sites. Called if the SuggestionsService is not
   // enabled, or if it returns no data.
   void InitiateTopSitesQuery();
 
   // Callback for when data is available from TopSites.
@@ skipping 113 matching lines @@
 
   SuggestionsVector current_suggestions_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<MostVisitedSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MostVisitedSites);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_MOST_VISITED_SITES_H_