Taking over issue 10006037: Moved WebDataService to ProfileKeyedService

chrome/test/base/testing_profile.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/test/base/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/search_engines/template_url_fetcher_factory.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"
-#include "chrome/browser/sync/profile_sync_service_mock.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/bookmark_load_observer.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/test/mock_resource_context.h"
@@ skipping 178 matching lines @@
 
   profile_dependency_manager_->DestroyProfileServices(this);
 
   if (host_content_settings_map_)
     host_content_settings_map_->ShutdownOnUIThread();
 
   DestroyTopSites();
   DestroyHistoryService();
   // FaviconService depends on HistoryServce so destroying it later.
   DestroyFaviconService();
-  DestroyWebDataService();
 
   if (pref_proxy_config_tracker_.get())
     pref_proxy_config_tracker_->DetachFromPrefService();
 }
 
 void TestingProfile::CreateFaviconService() {
   favicon_service_.reset(new FaviconService(this));
 }
 
 void TestingProfile::CreateHistoryService(bool delete_file, bool no_db) {
@@ skipping 72 matching lines @@
 
 void TestingProfile::CreateAutocompleteClassifier() {
   autocomplete_classifier_.reset(new AutocompleteClassifier(this));
 }
 
 void TestingProfile::CreateProtocolHandlerRegistry() {
   protocol_handler_registry_ = new ProtocolHandlerRegistry(this,
       new ProtocolHandlerRegistry::Delegate());
 }
 
-void TestingProfile::CreateWebDataService(bool delete_file) {
-  if (web_data_service_.get())
-    web_data_service_->Shutdown();
+static scoped_refptr<RefcountedProfileKeyedService> BuildWebDataService(
+    Profile* profile) {
+  WebDataService* web_data_service = new WebDataService();
+  if (web_data_service)
+    web_data_service->Init(profile->GetPath());
+  return scoped_refptr<WebDataService>(web_data_service);
+}
 
-  if (delete_file) {
-    FilePath path = GetPath();
-    path = path.Append(chrome::kWebDataFilename);
-    file_util::Delete(path, false);
-  }
-
-  web_data_service_ = new WebDataService;
-  if (web_data_service_.get())
-    web_data_service_->Init(GetPath());
+void TestingProfile::CreateWebDataService() {
+  WebDataServiceFactory::GetInstance()->SetTestingFactoryAndUse(
+      this, BuildWebDataService);
 }
 
 void TestingProfile::BlockUntilBookmarkModelLoaded() {
   DCHECK(bookmark_bar_model_.get());
   if (bookmark_bar_model_->IsLoaded())
     return;
   BookmarkLoadObserver observer;
   bookmark_bar_model_->AddObserver(&observer);
   MessageLoop::current()->Run();
   bookmark_bar_model_->RemoveObserver(&observer);
@@ skipping 127 matching lines @@
 }
 
 AutocompleteClassifier* TestingProfile::GetAutocompleteClassifier() {
   return autocomplete_classifier_.get();
 }
 
 history::ShortcutsBackend* TestingProfile::GetShortcutsBackend() {
   return NULL;
 }
 
-WebDataService* TestingProfile::GetWebDataService(ServiceAccessType access) {
-  return web_data_service_.get();
-}
-
-WebDataService* TestingProfile::GetWebDataServiceWithoutCreating() {
-  return web_data_service_.get();
-}
-
 void TestingProfile::SetPrefService(PrefService* prefs) {
 #if defined(ENABLE_PROTECTOR_SERVICE)
   // ProtectorService binds itself very closely to the PrefService at the moment
   // of Profile creation and watches pref changes to update their backup.
   // For tests that replace the PrefService after TestingProfile creation,
   // ProtectorService is disabled to prevent further invalid memory accesses.
   protector::ProtectorServiceFactory::GetInstance()->
       SetTestingFactory(this, NULL);
 #endif
   prefs_.reset(prefs);
@@ skipping 185 matching lines @@
 }
 
 PrefService* TestingProfile::GetOffTheRecordPrefs() {
   return NULL;
 }
 
 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() {
   return GetExtensionSpecialStoragePolicy();
 }
 
-void TestingProfile::DestroyWebDataService() {
-  if (!web_data_service_.get())
-    return;
-
-  web_data_service_->Shutdown();
-}
-
 bool TestingProfile::WasCreatedByVersionOrLater(const std::string& version) {
   return true;
 }
 
 base::Callback<ChromeURLDataManagerBackend*(void)>
     TestingProfile::GetChromeURLDataManagerBackendGetter() const {
   return base::Callback<ChromeURLDataManagerBackend*(void)>();
 }