Second try at splitting WebDataService (minus ownership changes)

chrome/browser/search_engines/template_url_service_test_util.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/browser/search_engines/template_url_service_test_util.h"
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 103 matching lines @@
 };
 
 void TemplateURLServiceTestingProfile::SetUp() {
   db_thread_.Start();
 
   // Make unique temp directory.
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
   base::FilePath path = temp_dir_.path().AppendASCII("TestDataService.db");
   service_ = new WebDataService;
-  ASSERT_TRUE(service_->InitWithPath(path));
+  service_->Init(path);
 }
 
 void TemplateURLServiceTestingProfile::TearDown() {
   // Clear the request context so it will get deleted. This should be done
   // before shutting down the I/O thread to avoid memory leaks.
   ResetRequestContext();
 
   // Wait for the delete of the request context to happen.
   if (io_thread_.IsRunning())
     TemplateURLServiceTestUtil::BlockTillIOThreadProcessesRequests();
@@ skipping 91 matching lines @@
   ResetObserverCount();
 }
 
 void TemplateURLServiceTestUtil::ChangeModelToLoadState() {
   model()->ChangeToLoadedState();
   // Initialize the web data service so that the database gets updated with
   // any changes made.
 
   model()->service_ = WebDataServiceFactory::GetForProfile(
       profile_.get(), Profile::EXPLICIT_ACCESS);
+  BlockTillServiceProcessesRequests();
 }
 
 void TemplateURLServiceTestUtil::ClearModel() {
   TemplateURLServiceFactory::GetInstance()->SetTestingFactory(
       profile_.get(), NULL);
 }
 
 void TemplateURLServiceTestUtil::ResetModel(bool verify_load) {
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       profile_.get(), TestingTemplateURLService::Build);
@@ skipping 83 matching lines @@
   return profile_.get();
 }
 
 void TemplateURLServiceTestUtil::StartIOThread() {
   profile_->StartIOThread();
 }
 
 void TemplateURLServiceTestUtil::PumpLoop() {
   message_loop_.RunUntilIdle();
 }