Make WebDataService no longer depend on 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 5142f3e7202bac5d6288eef90a94f471c26a2e64..82067b18218d75bcdcf2bfadb239684e533be444 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -420,14 +420,9 @@ void TestingProfile::CreateBookmarkModel(bool delete_file) {
   }
 }
 
-static scoped_refptr<RefcountedProfileKeyedService> BuildWebDataService(
+static ProfileKeyedService* BuildWebDataService(
     Profile* profile) {
-  base::FilePath path = profile->GetPath();
-  path = path.Append(chrome::kWebDataFilename);
-  WebDataService* web_data_service = new WebDataService();
-  if (web_data_service)
-    web_data_service->Init(path);
-  return web_data_service;
+  return new WebDataServiceWrapper(profile);
 }
 
 void TestingProfile::CreateWebDataService() {