Index: chrome/browser/android/ntp/most_visited_sites.cc |
diff --git a/chrome/browser/android/ntp/most_visited_sites.cc b/chrome/browser/android/ntp/most_visited_sites.cc |
index 70b57bf9fb0096bc8c47c4acf59c7f149c096830..8e62965be0e22689ab632e52f1b7ae8b9e750377 100644 |
--- a/chrome/browser/android/ntp/most_visited_sites.cc |
+++ b/chrome/browser/android/ntp/most_visited_sites.cc |
@@ -191,7 +191,7 @@ MostVisitedSites::~MostVisitedSites() { |
} |
void MostVisitedSites::SetMostVisitedURLsObserver( |
- MostVisitedSitesObserver* observer, int num_sites) { |
+ MostVisitedSites::Observer* observer, int num_sites) { |
observer_ = observer; |
num_sites_ = num_sites; |
@@ -750,18 +750,7 @@ void MostVisitedSites::NotifyMostVisitedURLsObserver() { |
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) { |
@@ -775,15 +764,7 @@ void MostVisitedSites::OnPopularSitesAvailable(bool success) { |
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(); |
} |