Topsites become keyedService based.

chrome/test/base/testing_profile.cc

 // 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.
 
 #include "chrome/test/base/testing_profile.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/chrome_history_client.h"
 #include "chrome/browser/history/chrome_history_client_factory.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_db_task.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/history/top_sites_provider.h"
+#include "chrome/browser/history/top_sites_service_factory.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/net/pref_proxy_config_tracker.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ skipping 68 matching lines @@
 using testing::NiceMock;
 using testing::Return;
 
 namespace {
 
 // Used to make sure TopSites has finished loading
 class WaitTopSitesLoadedObserver : public history::TopSitesObserver {
  public:
   explicit WaitTopSitesLoadedObserver(content::MessageLoopRunner* runner)
       : runner_(runner) {}
-  void TopSitesLoaded(history::TopSites* top_sites) override {
+  void TopSitesLoaded(history::TopSitesProvider* top_sites) override {
     runner_->Quit();
   }
-  void TopSitesChanged(history::TopSites* top_sites) override {}
+  void TopSitesChanged(history::TopSitesProvider* top_sites) override {}
 
  private:
   // weak
   content::MessageLoopRunner* runner_;
 };
 
 // Task used to make sure history has finished processing a request. Intended
 // for use with BlockUntilHistoryProcessesPendingRequests.
 
 class QuittingHistoryDBTask : public history::HistoryDBTask {
@@ skipping 83 matching lines @@
 }
 
 KeyedService* BuildChromeBookmarkClient(
     content::BrowserContext* context) {
   return new ChromeBookmarkClient(static_cast<Profile*>(context));
 }
 
 KeyedService* BuildChromeHistoryClient(
     content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
-  return new ChromeHistoryClient(BookmarkModelFactory::GetForProfile(profile),
-                                 profile,
-                                 profile->GetTopSites());
+  return new ChromeHistoryClient(
+      BookmarkModelFactory::GetForProfile(profile), profile,
+      TopSitesServiceFactory::GetForProfile(profile));
 }
 
 void TestProfileErrorCallback(WebDataServiceWrapper::ErrorType error_type,
                               sql::InitStatus status) {
   NOTREACHED();
 }
 
 KeyedService* BuildWebDataService(content::BrowserContext* context) {
   const base::FilePath& context_path = context->GetPath();
   return new WebDataServiceWrapper(
@@ skipping 325 matching lines @@
 
   // Make sure we don't have any event pending that could disrupt the next
   // test.
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
   base::MessageLoop::current()->Run();
 }
 
 void TestingProfile::CreateTopSites() {
   DestroyTopSites();
-  top_sites_ = history::TopSites::Create(

[sdefresne, 2014/12/19 15:11:42]

Remove top_sites_ property from TestingProfile() and instead register a custom
testing factory here, see
RefcountedBrowserContextKeyedServiceFactory::SetTestingFactory().

[Jitu( very slow this week), 2014/12/26 14:04:28]

Done.

+  top_sites_ = history::TopSitesProvider::Create(
       this, GetPath().Append(chrome::kTopSitesFilename));
 }
 
-void TestingProfile::SetTopSites(history::TopSites* top_sites) {

[sdefresne, 2014/12/19 15:11:42]

You'll have to remove this method and instead change the only caller (in
chrome/browser/autocomplete/zero_suggest_provider_unittest.cc) to set a custom
factory for TopSitesServiceFactory, see
RefcountedBrowserContextKeyedServiceFactory::SetTestingFactory().

[Jitu( very slow this week), 2014/12/26 14:04:29]

Done.

+void TestingProfile::SetTopSites(history::TopSitesProvider* top_sites) {
   DestroyTopSites();
   top_sites_ = top_sites;
 }
 
 void TestingProfile::DestroyTopSites() {
   if (top_sites_.get()) {
     top_sites_->Shutdown();
     top_sites_ = NULL;
     // TopSitesImpl::Shutdown schedules some tasks (from TopSitesBackend) that
     // need to be run to properly shutdown. Run all pending tasks now. This is
@@ skipping 198 matching lines @@
       this, profile_policy_connector_.get());
   CHECK_EQ(profile_policy_connector_.get(),
            policy::ProfilePolicyConnectorFactory::GetForProfile(this));
 }
 
 PrefService* TestingProfile::GetPrefs() {
   DCHECK(prefs_);
   return prefs_.get();
 }
 
-history::TopSites* TestingProfile::GetTopSites() {

[sdefresne, 2014/12/19 15:11:42]

Remove.

[Jitu( very slow this week), 2014/12/26 14:04:29]

Done.

+history::TopSitesProvider* TestingProfile::GetTopSites() {
   return top_sites_.get();
 }
 
-history::TopSites* TestingProfile::GetTopSitesWithoutCreating() {

[sdefresne, 2014/12/19 15:11:42]

Remove.

[Jitu( very slow this week), 2014/12/26 14:04:28]

Done.

+history::TopSitesProvider* TestingProfile::GetTopSitesWithoutCreating() {
   return top_sites_.get();
 }
 
 DownloadManagerDelegate* TestingProfile::GetDownloadManagerDelegate() {
   return NULL;
 }
 
 net::URLRequestContextGetter* TestingProfile::GetRequestContext() {
   return GetDefaultStoragePartition(this)->GetURLRequestContext();
 }
@@ skipping 252 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
                             extension_policy_,
 #endif
                             pref_service_.Pass(),
                             original_profile,
                             guest_session_,
                             supervised_user_id_,
                             policy_service_.Pass(),
                             testing_factories_);
 }