Taking over issue 10006037: Moved WebDataService to ProfileKeyedService

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
===================================================================
--- chrome/browser/profiles/profile_impl.cc	(revision 136877)
+++ chrome/browser/profiles/profile_impl.cc	(working copy)
@@ -226,7 +226,6 @@
       host_content_settings_map_(NULL),
       history_service_created_(false),
       favicon_service_created_(false),
-      created_web_data_service_(false),
       clear_local_state_on_exit_(false),
       start_time_(Time::Now()),
       delegate_(delegate),
@@ -510,14 +509,12 @@
 
   ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
 
-  // Both HistoryService and WebDataService maintain threads for background
-  // processing. Its possible each thread still has tasks on it that have
-  // increased the ref count of the service. In such a situation, when we
-  // decrement the refcount, it won't be 0, and the threads/databases aren't
-  // properly shut down. By explicitly calling Cleanup/Shutdown we ensure the
-  // databases are properly closed.
-  if (web_data_service_.get())
-    web_data_service_->Shutdown();
+  // The HistoryService maintains threads for background processing. Its
+  // possible each thread still has tasks on it that have increased the ref
+  // count of the service. In such a situation, when we decrement the refcount,
+  // it won't be 0, and the threads/databases aren't properly shut down. By
+  // explicitly calling Cleanup/Shutdown we ensure the databases are properly
+  // closed.
 
   if (top_sites_.get())
     top_sites_->Shutdown();
@@ -832,25 +829,6 @@
   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();
 }