Topsites become keyedService based.

chrome/browser/history/top_sites_impl_unittest.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 "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 36 matching lines @@
 
 TestTopSitesObserver::TestTopSitesObserver(Profile* profile,
                                            history::TopSites* top_sites)
     : profile_(profile), top_sites_(top_sites) {
   DCHECK(top_sites_);
   top_sites_->AddObserver(this);
 }
 
 void TestTopSitesObserver::TopSitesLoaded(history::TopSites* top_sites) {
   content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_TOP_SITES_LOADED,
-      content::Source<Profile>(profile_),
+      chrome::NOTIFICATION_TOP_SITES_LOADED, content::Source<Profile>(profile_),
       content::Details<history::TopSites>(top_sites));
 }
 
 void TestTopSitesObserver::TopSitesChanged(history::TopSites* top_sites) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOP_SITES_CHANGED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
 }
 
@@ skipping 160 matching lines @@
   // Waits for top sites to finish processing a task. This is useful if you need
   // to wait until top sites finishes processing a task.
   void WaitForTopSites() {
     top_sites()->backend_->DoEmptyRequest(
         base::Bind(&TopSitesImplTest::QuitCallback, base::Unretained(this)),
         &top_sites_tracker_);
     base::MessageLoop::current()->Run();
   }
 
   TopSitesImpl* top_sites() {
-    return static_cast<TopSitesImpl*>(profile_->GetTopSites());
+    return static_cast<TopSitesImpl*>(
+        TopSitesServiceFactory::GetForProfile(profile_));

[sdefresne, 2014/12/29 09:48:14]

nit: TopSitesServiceFactory::GetForProfile(profile_).get()

[Jitu( very slow this week), 2014/12/30 10:09:03]

Done.

   }
   TestingProfile* profile() {return profile_.get();}
   HistoryService* history_service() {
     return HistoryServiceFactory::GetForProfile(profile_.get(),
                                                 Profile::EXPLICIT_ACCESS);
   }
 
   MostVisitedURLList GetPrepopulatePages() {
     return top_sites()->GetPrepopulatePages();
   }
@@ skipping 112 matching lines @@
   void EmptyThreadSafeCache() {
     base::AutoLock lock(top_sites()->lock_);
     MostVisitedURLList empty;
     top_sites()->thread_safe_cache_->SetTopSites(empty);
   }
 
   void CreateTopSitesAndObserver() {
     if (top_sites_observer_)
       top_sites_observer_.reset();
 
-    profile_->CreateTopSites();
+    profile_->CreateTopSitesService();
     top_sites_observer_.reset(
-        new TestTopSitesObserver(profile_.get(), profile_->GetTopSites()));
+        new TestTopSitesObserver(profile_.get(), TopSitesServiceFactory::GetForProfile(profile_));
   }
 
  private:
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<TestTopSitesObserver> top_sites_observer_;
   // To cancel HistoryService tasks.
   base::CancelableTaskTracker history_tracker_;
@@ skipping 1297 matching lines @@
   ASSERT_EQ(orig_thumbnail.getSize(), thumbnail.getSize());
   orig_thumbnail.lockPixels();
   thumbnail.lockPixels();
   EXPECT_EQ(0, memcmp(orig_thumbnail.getPixels(), thumbnail.getPixels(),
                       orig_thumbnail.getSize()));
   thumbnail.unlockPixels();
   orig_thumbnail.unlockPixels();
 }
 
 }  // namespace history