Moved WebDataService to ProfileKeyedService

chrome/test/base/testing_profile.cc

Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 67f4a9e02321f5669f2e2499308bf7ddc3d8adb9..c7a6ccebcbfd053fbb3f85315710e4035d01deb1 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -237,7 +237,6 @@ TestingProfile::~TestingProfile() {
   DestroyHistoryService();
   // FaviconService depends on HistoryServce so destroying it later.
   DestroyFaviconService();
-  DestroyWebDataService();
 
   if (pref_proxy_config_tracker_.get())
     pref_proxy_config_tracker_->DetachFromPrefService();
@@ -330,21 +329,6 @@ void TestingProfile::CreateProtocolHandlerRegistry() {
       new ProtocolHandlerRegistry::Delegate());
 }
 
-void TestingProfile::CreateWebDataService(bool delete_file) {
-  if (web_data_service_.get())
-    web_data_service_->Shutdown();
-
-  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::BlockUntilBookmarkModelLoaded() {
   DCHECK(bookmark_bar_model_.get());
   if (bookmark_bar_model_->IsLoaded())
@@ -498,14 +482,6 @@ 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
@@ -731,13 +707,6 @@ 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;
 }