Popular sites on the NTP: add thumbnails!

chrome/browser/android/popular_sites.cc

Index: chrome/browser/android/popular_sites.cc
diff --git a/chrome/browser/android/popular_sites.cc b/chrome/browser/android/popular_sites.cc
index 65cba7d18366c512179006a23025b3e231553eef..b998b708e5c4b715c1512667fe8de5bf0e3f266e 100644
--- a/chrome/browser/android/popular_sites.cc
+++ b/chrome/browser/android/popular_sites.cc
@@ -21,7 +21,7 @@ using content::BrowserThread;
 namespace {
 
 const char kPopularSitesURLFormat[] = "https://www.gstatic.com/chrome/ntp/%s";
-const char kPopularSitesDefaultFilename[] = "suggested_sites_IN_1.json";
+const char kPopularSitesDefaultFilename[] = "suggested_sites_IN_2.json";
 
 std::string GetPopularSitesFilename(const std::string& filename) {
   return filename.empty() ? kPopularSitesDefaultFilename : filename.c_str();
@@ -66,7 +66,11 @@ scoped_ptr<std::vector<PopularSites::Site>> ReadAndParseJsonFile(
       continue;
     std::string favicon_url;
     item->GetString("favicon_url", &favicon_url);
-    sites->push_back(PopularSites::Site(title, GURL(url), GURL(favicon_url)));
+    std::string thumbnail_url;
+    item->GetString("thumbnail_url", &thumbnail_url);
+
+    sites->push_back(PopularSites::Site(title, GURL(url), GURL(favicon_url),
+                                        GURL(thumbnail_url)));
   }
 
   return sites.Pass();
@@ -76,8 +80,12 @@ scoped_ptr<std::vector<PopularSites::Site>> ReadAndParseJsonFile(
 
 PopularSites::Site::Site(const base::string16& title,
                          const GURL& url,
-                         const GURL& favicon_url)
-    : title(title), url(url), favicon_url(favicon_url) {}
+                         const GURL& favicon_url,
+                         const GURL& thumbnail_url)
+    : title(title),
+      url(url),
+      favicon_url(favicon_url),
+      thumbnail_url(thumbnail_url) {}
 
 PopularSites::PopularSites(const std::string& filename,
                            net::URLRequestContextGetter* request_context,