Topsites become keyedService based.

chrome/browser/history/chrome_history_client.h

Index: chrome/browser/history/chrome_history_client.h
diff --git a/chrome/browser/history/chrome_history_client.h b/chrome/browser/history/chrome_history_client.h
index fbaffc0e9cbb8ff747137dd451f753cab5dc1cac..f1e573a329addfefd3c257fa34d80791ea1b3098 100644
--- a/chrome/browser/history/chrome_history_client.h
+++ b/chrome/browser/history/chrome_history_client.h
@@ -14,7 +14,7 @@ class HistoryService;
 class Profile;
 
 namespace history {
-class TopSites;
+class TopSitesProvider;
 }
 
 // This class implements history::HistoryClient to abstract operations that
@@ -24,7 +24,7 @@ class ChromeHistoryClient : public history::HistoryClient,
  public:
   explicit ChromeHistoryClient(BookmarkModel* bookmark_model,
                                Profile* profile,
-                               history::TopSites* top_sites);
+                               history::TopSitesProvider* top_sites_provider);
   ~ChromeHistoryClient() override;
 
   // history::HistoryClient:
@@ -38,8 +38,8 @@ class ChromeHistoryClient : public history::HistoryClient,
   void Shutdown() override;
 
   // TopSitesObserver:
-  void TopSitesLoaded(history::TopSites* top_sites) override;
-  void TopSitesChanged(history::TopSites* top_sites) override;
+  void TopSitesLoaded(history::TopSitesProvider* top_sites_provider) override;
+  void TopSitesChanged(history::TopSitesProvider* top_sites_provider) override;
 
  private:
   // The BookmarkModel, this should outlive ChromeHistoryClient.
@@ -55,7 +55,7 @@ class ChromeHistoryClient : public history::HistoryClient,
   // can  be constructed. The TopSites does not use the HistoryService nor the
   // HistoryClient during construction (it uses it later, but supports getting
   // an NULL  pointer).
-  history::TopSites* top_sites_;
+  history::TopSitesProvider* top_sites_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeHistoryClient);
 };