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 56 matching lines @@
  private:
   friend class MostVisitedSitesTest;
 
   // The source of the Most Visited sites.
   enum MostVisitedSource { TOP_SITES, SUGGESTIONS_SERVICE, POPULAR, WHITELIST };
 
   struct Suggestion {
     base::string16 title;
     GURL url;
     MostVisitedSource source;
+    // Only valid for source == WHITELIST (empty otherwise).

[Bernhard Bauer, 2016/03/15 12:03:35]

Please add empty lines before comments, to make it look less cramped.

[atanasova, 2016/03/16 10:55:24]

Done.

+    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,
                MostVisitedSource source);
     Suggestion(const base::string16& title,
                const GURL& url,
+               MostVisitedSource source,
+               const base::FilePath& large_icon_path);
+    Suggestion(const base::string16& title,

[Bernhard Bauer, 2016/03/15 12:03:35]

Do we really need all of these constructors? Could you at least use delegation
to get rid of all the duplicated code?

Other possibilities:
* A single constructor, with static convenience methods for the various kinds of
suggestions (whitelist, suggestions, etc.) that take only the parameters needed
for that type
* A builder class.

[atanasova, 2016/03/16 10:55:24]

Created a builder class

+               const GURL& url,
                MostVisitedSource source);
     Suggestion(const base::string16& title,
                const std::string& url,
                MostVisitedSource source,
                int provider_index);
     ~Suggestion();
 
     // Get the Histogram name associated with the source.
     std::string GetSourceHistogramName() const;
 
@@ skipping 127 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_