Topsites become keyedService based.

chrome/browser/history/top_sites_impl_unittest.cc

Index: chrome/browser/history/top_sites_impl_unittest.cc
diff --git a/chrome/browser/history/top_sites_impl_unittest.cc b/chrome/browser/history/top_sites_impl_unittest.cc
index fa8340a1f7e5aca77feb35b0bd0c596ed5eda5bf..49e3a1c48cf1cac5199c30b62a3f2bca09e319ec 100644
--- a/chrome/browser/history/top_sites_impl_unittest.cc
+++ b/chrome/browser/history/top_sites_impl_unittest.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_unittest_base.h"
 #include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/history/top_sites_impl.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
@@ -236,7 +237,8 @@ class TopSitesImplTest : public HistoryUnitTestBase {
   }
 
   TopSitesImpl* top_sites() {
-    return static_cast<TopSitesImpl*>(profile_->GetTopSites());
+    return static_cast<TopSitesImpl*>(
+        TopSitesFactory::GetForProfile(profile_).get());

[sdefresne, 2015/01/21 17:57:23]

This line won't compile, it need to be:

return static_cast<TopSitesImpl*>(
    TopSitesFactory::GetForProfile(profile_.get()).get());

   }
   TestingProfile* profile() {return profile_.get();}
   HistoryService* history_service() {
@@ -371,7 +373,7 @@ class TopSitesImplTest : public HistoryUnitTestBase {
 
     profile_->CreateTopSites();
     top_sites_observer_.reset(
-        new TestTopSitesObserver(profile_.get(), profile_->GetTopSites()));
+     new TestTopSitesObserver(profile_.get(), TopSitesFactory::GetForProfile(profile_));

[sdefresne, 2015/01/21 17:57:23]

This line is incorrectly formatted, it should have been:

top_sites_observer_.reset(new TopSitesObserver(
    profile_.get(), TopSitesFactory::GetForProfile(profile())));

However, this line has been removed upstream as the "TestTopSitesObserver" was
unnecessary. Please fetch and rebase your patch on top of HEAD (code changes
often) and then re-upload your CL.

   }
 
  private: