Second try at splitting WebDataService (minus ownership changes)

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 244046e4848afb903065da334133e6f0e2a04cbc..69c2d7ecd2fc923678e34b52eabd307b662af33c 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.cc
+++ b/chrome/browser/search_engines/template_url_service_test_util.cc
@@ -121,7 +121,7 @@ void TemplateURLServiceTestingProfile::SetUp() {
 
   base::FilePath path = temp_dir_.path().AppendASCII("TestDataService.db");
   service_ = new WebDataService;
-  ASSERT_TRUE(service_->InitWithPath(path));
+  service_->Init(path);
 }
 
 void TemplateURLServiceTestingProfile::TearDown() {
@@ -233,6 +233,7 @@ void TemplateURLServiceTestUtil::ChangeModelToLoadState() {
 
   model()->service_ = WebDataServiceFactory::GetForProfile(
       profile_.get(), Profile::EXPLICIT_ACCESS);
+  BlockTillServiceProcessesRequests();
 }
 
 void TemplateURLServiceTestUtil::ClearModel() {