Moved WebDataService to ProfileKeyedService

chrome/browser/search_engines/template_url_service_test_util.cc

Index: chrome/browser/search_engines/template_url_service_test_util.cc
diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc
index 4388e7fcca24f1c75589e32fbd95a25180e577d0..3aa275bb8fd25949fdd94ac51e6edad58358bb35 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.cc
+++ b/chrome/browser/search_engines/template_url_service_test_util.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
@@ -127,7 +128,7 @@ void TemplateURLServiceTestingProfile::TearDown() {
 
   // Clean up the test directory.
   if (service_.get())
-    service_->Shutdown();
+    service_ = NULL;
   // Note that we must ensure the DB thread is stopped after WDS
   // shutdown (so it can commit pending transactions) but before
   // deleting the test profile directory, otherwise we may not be
@@ -195,7 +196,9 @@ void TemplateURLServiceTestUtil::ChangeModelToLoadState() {
   model()->ChangeToLoadedState();
   // Initialize the web data service so that the database gets updated with
   // any changes made.
-  model()->service_ = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
+  model()->service_ =

[Peter Kasting, 2012/03/27 18:18:25]

Nit: Another way would be

  model()->service_ = WebDataServiceFactory::GetForProfile(
      profile_.get(), Profile::EXPLICIT_ACCESS);

[GeorgeY, 2012/03/30 19:20:12]

Done.

+      WebDataServiceFactory::GetForProfile(profile_.get(),
+                                           Profile::EXPLICIT_ACCESS);
 }
 
 void TemplateURLServiceTestUtil::ClearModel() {