Topsites become keyedService based.

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 670bbb966b0d57be891afbdbd54cab6cf2cd70c9..aa1d86b564b5da226fa719d503ad5e2a96716efd 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -38,7 +38,6 @@
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
-#include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/net_pref_observer.h"
 #include "chrome/browser/net/predictor.h"
@@ -824,9 +823,6 @@ ProfileImpl::~ProfileImpl() {
   BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
       this);
 
-  if (top_sites_.get())
-    top_sites_->Shutdown();

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

This line was the only call to "TopSites::Shutdown()". Now that "TopSites" is a
"RefcountedKeyedService" then the "DependencyManager" will invoke the
"TopSites::ShutdownOnUIThread()" method instead, so you should remove the
"TopSites::Shutdown()" method and move the implementation into
"TopSites::ShutdownOnUIThread()" (whose only real implementation is in
"TopSitesImpl").

This is what was causing the "DCHECK(!db_);" to be reached in "TopSitesBackend"
destructor since the "db_" member is deleted in
"TopSitesBackend::ShutdownDBOnDBThread" which is invoked from
"TopSitesBackend::Shutdown" itself called from "TopSitesImpl::Shutdown" (which
is no longer called).

-
   if (pref_proxy_config_tracker_)
     pref_proxy_config_tracker_->DetachFromPrefService();
 
@@ -1169,18 +1165,6 @@ Time ProfileImpl::GetStartTime() const {
   return start_time_;
 }
 
-history::TopSites* ProfileImpl::GetTopSites() {
-  if (!top_sites_.get()) {
-    top_sites_ = history::TopSites::Create(
-        this, GetPath().Append(chrome::kTopSitesFilename));
-  }
-  return top_sites_.get();
-}
-
-history::TopSites* ProfileImpl::GetTopSitesWithoutCreating() {
-  return top_sites_.get();
-}
-
 #if defined(ENABLE_SESSION_SERVICE)
 void ProfileImpl::StopCreateSessionServiceTimer() {
   create_session_service_timer_.Stop();