Topsites become keyedService based.

chrome/test/base/testing_profile.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
 
 #include <string>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #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;
 class SSLHostStateDelegate;
 class ZoomLevelDelegate;
 }
 
 namespace history {
 class TopSites;
 }
@@ skipping 145 matching lines @@
   // deleted first, then the HistoryService is created. As TestingProfile
   // deletes the directory containing the files used by HistoryService, this
   // only matters if you're recreating the HistoryService.  If |no_db| is true,
   // the history backend will fail to initialize its database; this is useful
   // for testing error conditions. Returns true on success.
   bool CreateHistoryService(bool delete_file, bool no_db) WARN_UNUSED_RESULT;
 
   // Shuts down and nulls out the reference to HistoryService.
   void DestroyHistoryService();
 
-  // Creates TopSites. This returns immediately, and top sites may not be
-  // loaded. Use BlockUntilTopSitesLoaded to ensure TopSites has finished
-  // 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();
-
   // Creates the BookmarkBarModel. If not invoked the bookmark bar model is
   // NULL. If |delete_file| is true, the bookmarks file is deleted first, then
   // the model is created. As TestingProfile deletes the directory containing
   // the files used by HistoryService, the boolean only matters if you're
   // recreating the BookmarkModel.
   //
   // NOTE: this does not block until the bookmarks are loaded. For that use
   // WaitForBookmarkModelToLoad().
   void CreateBookmarkModel(bool delete_file);
 
+  void CreateTopSitesService();

[sdefresne, 2015/01/08 10:41:02]

nit: leave this method named CreateTopSites() and keep the original comment as
it is still true.

[Jitu( very slow this week), 2015/01/12 11:30:09]

Done.

+
   // Creates a WebDataService. If not invoked, the web data service is NULL.
   void CreateWebDataService();
 
   // Blocks until the HistoryService finishes restoring its in-memory cache.
   // This is NOT invoked from CreateHistoryService.
   void BlockUntilHistoryIndexIsRefreshed();
 
   // Blocks until TopSites finishes loading.
   void BlockUntilTopSitesLoaded();
 
@@ skipping 61 matching lines @@
       ExtensionSpecialStoragePolicy* extension_special_storage_policy);
 #endif
   ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override;
   // TODO(ajwong): Remove this API in favor of directly retrieving the
   // CookieStore from the StoragePartition after ExtensionURLRequestContext
   // has been removed.
   net::CookieMonster* GetCookieMonster();
 
   PrefService* GetPrefs() override;
 
-  history::TopSites* GetTopSites() override;
-  history::TopSites* GetTopSitesWithoutCreating() override;
-
   net::URLRequestContextGetter* GetMediaRequestContext() override;
   net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
       int renderer_child_id) override;
   net::URLRequestContextGetter* GetRequestContextForExtensions() override;
   net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition(
       const base::FilePath& partition_path,
       bool in_memory) override;
   net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       const base::FilePath& partition_path,
       bool in_memory,
@@ skipping 79 matching lines @@
   bool guest_session_;
 
   std::string supervised_user_id_;
 
   // Did the last session exit cleanly? Default is true.
   bool last_session_exited_cleanly_;
 
   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>
       extension_special_storage_policy_;
 #endif
 
   // The proxy prefs tracker.
   scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 
   // We use a temporary directory to store testing profile data. In a multi-
@@ skipping 20 matching lines @@
 
   // Weak pointer to a delegate for indicating that a profile was created.
   Delegate* delegate_;
 
   std::string profile_name_;
 
   scoped_ptr<policy::PolicyService> policy_service_;
 };
 
 #endif  // CHROME_TEST_BASE_TESTING_PROFILE_H_