Moved WebDataService to ProfileKeyedService

chrome/browser/profiles/profile_impl.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 "chrome/browser/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 209 matching lines @@
 ProfileImpl::ProfileImpl(const FilePath& path,
                          Delegate* delegate,
                          CreateMode create_mode)
     : path_(path),
       ALLOW_THIS_IN_INITIALIZER_LIST(visited_link_event_listener_(
           new VisitedLinkEventListener(this))),
       ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
       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),
       session_restore_enabled_(false) {
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
 
 #if defined(ENABLE_SESSION_SERVICE)
   create_session_service_timer_.Start(FROM_HERE,
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
@@ skipping 239 matching lines @@
   if (io_data_.HasMainRequestContext() &&
       default_request_context_ == GetRequestContext()) {
     default_request_context_ = NULL;
   }
 
   // Destroy OTR profile and its profile services first.
   DestroyOffTheRecordProfile();
 
   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();
 
   if (bookmark_bar_model_.get()) {
     // It's possible that bookmarks haven't loaded and history is waiting for
     // bookmarks to complete loading. In such a situation history can't shutdown
     // (meaning if we invoked history_service_->Cleanup now, we would
     // deadlock). To break the deadlock we tell BookmarkModel it's about to be
     // deleted so that it can release the signal history is waiting on, allowing
@@ skipping 297 matching lines @@
 history::ShortcutsBackend* ProfileImpl::GetShortcutsBackend() {
   // This is called on one thread only - UI, so no magic is needed to protect
   // against the multiple concurrent calls.
   if (!shortcuts_backend_.get()) {
     shortcuts_backend_ = new history::ShortcutsBackend(GetPath(), this);
     CHECK(shortcuts_backend_->Init());
   }
   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();
 }
 
 bool ProfileImpl::DidLastSessionExitCleanly() {
   // last_session_exited_cleanly_ is set when the preferences are loaded. Force
   // it to be set by asking for the prefs.
   GetPrefs();
   return last_session_exited_cleanly_;
 }
@@ skipping 312 matching lines @@
                                      FilePath* cache_path,
                                      int* max_size) {
   DCHECK(cache_path);
   DCHECK(max_size);
   FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }