Update MostVisitedSites observer interface.

chrome/browser/android/ntp/most_visited_sites.cc

 // 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.
 
 #include "chrome/browser/android/ntp/most_visited_sites.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 173 matching lines @@
   supervised_user_service->AddObserver(this);
 }
 
 MostVisitedSites::~MostVisitedSites() {
   SupervisedUserService* supervised_user_service =
       SupervisedUserServiceFactory::GetForProfile(profile_);
   supervised_user_service->RemoveObserver(this);
 }
 
 void MostVisitedSites::SetMostVisitedURLsObserver(
-      MostVisitedSitesObserver* observer, int num_sites) {
+      MostVisitedSites::Observer* observer, int num_sites) {
   observer_ = observer;
   num_sites_ = num_sites;
 
   if (ShouldShowPopularSites() &&
       NeedPopularSites(profile_->GetPrefs(), num_sites_)) {
     popular_sites_.reset(new PopularSites(
         profile_,
         GetPopularSitesCountry(),
         GetPopularSitesVersion(),
         false,
@@ skipping 538 matching lines @@
   if (received_most_visited_sites_ && received_popular_sites_ &&
       !recorded_uma_) {
     RecordImpressionUMAMetrics();
     UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.NumberOfTiles", num_suggestions);
     recorded_uma_ = true;
   }
 
   if (!observer_)
     return;
 
-  std::vector<base::string16> titles;
-  std::vector<std::string> urls;
-  std::vector<std::string> whitelist_icon_paths;
-  titles.reserve(num_suggestions);
-  urls.reserve(num_suggestions);
-  for (const auto& suggestion : current_suggestions_) {
-    titles.push_back(suggestion->title);
-    urls.push_back(suggestion->url.spec());
-    whitelist_icon_paths.push_back(suggestion->whitelist_icon_path.value());
-  }
-
-  observer_->OnMostVisitedURLsAvailable(titles, urls, whitelist_icon_paths);
+  observer_->OnMostVisitedURLsAvailable(current_suggestions_);
 }
 
 void MostVisitedSites::OnPopularSitesAvailable(bool success) {
   received_popular_sites_ = true;
 
   if (!success) {
     LOG(WARNING) << "Download of popular sites failed";
     return;
   }
 
   if (!observer_)
     return;
 
-  std::vector<std::string> urls;
-  std::vector<std::string> favicon_urls;
-  std::vector<std::string> large_icon_urls;
-  for (const PopularSites::Site& popular_site : popular_sites_->sites()) {
-    urls.push_back(popular_site.url.spec());
-    favicon_urls.push_back(popular_site.favicon_url.spec());
-    large_icon_urls.push_back(popular_site.large_icon_url.spec());
-  }
-  observer_->OnPopularURLsAvailable(urls, favicon_urls, large_icon_urls);
+  observer_->OnPopularURLsAvailable(popular_sites_->sites());
   QueryMostVisitedURLs();
 }
 
 void MostVisitedSites::RecordImpressionUMAMetrics() {
   for (size_t i = 0; i < current_suggestions_.size(); i++) {
     std::string histogram = base::StringPrintf(
         "NewTabPage.SuggestionsImpression.%s",
         current_suggestions_[i]->GetSourceHistogramName().c_str());
     LogHistogramEvent(histogram, static_cast<int>(i), num_sites_);
   }
 }
 
 void MostVisitedSites::TopSitesLoaded(TopSites* top_sites) {}
 
 void MostVisitedSites::TopSitesChanged(TopSites* top_sites,
                                        ChangeReason change_reason) {
   if (mv_source_ == TOP_SITES) {
     // The displayed suggestions are invalidated.
     InitiateTopSitesQuery();
   }
 }