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 6602f26139ede12e9cf36a51969508e7a0c9b0d3..48ccc58002a2177502ddec01dac1405fe946adde 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -227,7 +227,6 @@ ProfileImpl::ProfileImpl(const FilePath& path,
       host_content_settings_map_(NULL),
       history_service_created_(false),
       favicon_service_created_(false),
-      created_web_data_service_(false),
       start_time_(Time::Now()),
       delegate_(delegate),
       predictor_(NULL),
@@ -487,14 +486,12 @@ ProfileImpl::~ProfileImpl() {
 
   ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
 
-  // Both HistoryService and WebDataService maintain threads for background
+  // HistoryService maintains threads for background

[Ilya Sherman, 2012/04/17 21:32:15]

nit: "HistoryService" -> "The HistoryService".  Also, please re-wrap the comment
lines here.

[GeorgeY, 2012/04/18 18:14:46]

Done.

   // 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();
 
   if (top_sites_.get())
     top_sites_->Shutdown();
@@ -812,25 +809,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();
 }