Moved WebDataService to ProfileKeyedService

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 587bc4f9430d67e35907eef18382c4d11431c2e0..2dfead380118c00893c69fffc1e8513f033f521b 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -590,7 +590,7 @@ ProfileImpl::~ProfileImpl() {
   // properly shut down. By explicitly calling Cleanup/Shutdown we ensure the
   // databases are properly closed.
   if (web_data_service_.get())

[rpetterson, 2012/03/27 01:15:06]

Should this even be here? The profile shouldn't even have a reference to the
web_data_service_ any more, right?

[GeorgeY, 2012/03/30 19:20:12]

yes removed and adjusted the comment

-    web_data_service_->Shutdown();
+    web_data_service_ = NULL;
 
   if (top_sites_.get())
     top_sites_->Shutdown();
@@ -967,25 +967,6 @@ history::ShortcutsBackend* ProfileImpl::GetShortcutsBackend() {
   return shortcuts_backend_.get();
 }
 
-WebDataService* ProfileImpl::GetWebDataService(ServiceAccessType sat) {
-  if (!created_web_data_service_)
-    CreateWebDataService();
-  return web_data_service_.get();
-}
-
-WebDataService* ProfileImpl::GetWebDataServiceWithoutCreating() {
-  return web_data_service_.get();
-}
-
-void ProfileImpl::CreateWebDataService() {
-  DCHECK(!created_web_data_service_ && web_data_service_.get() == NULL);
-  created_web_data_service_ = true;
-  scoped_refptr<WebDataService> wds(new WebDataService());
-  if (!wds->Init(GetPath()))
-    return;
-  web_data_service_.swap(wds);
-}
-
 DownloadManager* ProfileImpl::GetDownloadManager() {
   return DownloadServiceFactory::GetForProfile(this)->GetDownloadManager();
 }