Make TopSites a RefcountedKeyedService

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..ca4c67416067fd5ff71fb7dc7bf3993e9864e212 100644
--- a/chrome/test/base/testing_profile.h
+++ b/chrome/test/base/testing_profile.h
@@ -13,6 +13,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "components/domain_reliability/clear_mode.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
+#include "components/keyed_service/core/refcounted_keyed_service.h"
 
 namespace content {
 class MockResourceContext;
@@ -183,10 +184,6 @@ class TestingProfile : public Profile {
   // loading.
   void CreateTopSites();
 
-  // 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);
-
   // Shuts down and nulls out the reference to TopSites.
   void DestroyTopSites();
 
@@ -281,9 +278,6 @@ class TestingProfile : public Profile {
 
   PrefService* GetPrefs() override;
 
-  history::TopSites* GetTopSites() override;
-  history::TopSites* GetTopSitesWithoutCreating() override;
-
   net::URLRequestContextGetter* GetMediaRequestContext() override;
   net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
       int renderer_child_id) override;
@@ -383,7 +377,6 @@ 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.
 
 #if defined(ENABLE_EXTENSIONS)
   scoped_refptr<ExtensionSpecialStoragePolicy>