Topsites become keyedService based.

chrome/test/base/testing_profile.h

Index: chrome/test/base/testing_profile.h
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
index edb28debda7535d960bc880f40a6c27af1c53f8b..db9fa16a9e378e62a4ac4a5170f4dde0dbdcce92 100644
--- a/chrome/test/base/testing_profile.h
+++ b/chrome/test/base/testing_profile.h
@@ -21,7 +21,7 @@ class ZoomLevelDelegate;
 }
 
 namespace history {
-class TopSites;
+class TopSitesProvider;
 }
 
 namespace net {
@@ -185,7 +185,7 @@ class TestingProfile : public Profile {
 
   // Allows to set a test implementation |top_sites|. Testing profile owns
   // the reference and is responsible for releasing memory.
-  void SetTopSites(history::TopSites* top_sites);
+  void SetTopSites(history::TopSitesProvider* top_sites);
 
   // Shuts down and nulls out the reference to TopSites.
   void DestroyTopSites();
@@ -281,8 +281,8 @@ class TestingProfile : public Profile {
 
   PrefService* GetPrefs() override;
 
-  history::TopSites* GetTopSites() override;
-  history::TopSites* GetTopSitesWithoutCreating() override;
+  history::TopSitesProvider* GetTopSites();
+  history::TopSitesProvider* GetTopSitesWithoutCreating();
 
   net::URLRequestContextGetter* GetMediaRequestContext() override;
   net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
@@ -383,7 +383,8 @@ class TestingProfile : public Profile {
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
 
   base::FilePath last_selected_directory_;
-  scoped_refptr<history::TopSites> top_sites_;  // For history and thumbnails.
+  scoped_refptr<history::TopSitesProvider>
+      top_sites_;  // For history and thumbnails.
 
 #if defined(ENABLE_EXTENSIONS)
   scoped_refptr<ExtensionSpecialStoragePolicy>