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"
 #include "chrome/browser/history/history_notifications.h"
 #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"
 #include "chrome/test/base/testing_profile.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites_cache.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 204 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*>(
+        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() {
     return HistoryServiceFactory::GetForProfile(
         profile_.get(), ServiceAccessType::EXPLICIT_ACCESS);
   }
 
   MostVisitedURLList GetPrepopulatePages() {
     return top_sites()->GetPrepopulatePages();
   }
@@ skipping 114 matching lines @@
     MostVisitedURLList empty;
     top_sites()->thread_safe_cache_->SetTopSites(empty);
   }
 
   void CreateTopSitesAndObserver() {
     if (top_sites_observer_)
       top_sites_observer_.reset();
 
     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:
   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