Moved WebDataService to ProfileKeyedService

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/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
+#include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #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"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace {
 
@@ skipping 95 matching lines @@
 
   // Wait for the delete of the request context to happen.
   if (io_thread_.IsRunning())
     TemplateURLServiceTestUtil::BlockTillIOThreadProcessesRequests();
 
   // The I/O thread must be shutdown before the DB thread.
   io_thread_.Stop();
 
   // 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
   // able to delete it due to an open transaction.
+  // Schedule another task on the DB thread to notify us that it's safe to
+  // carry on with the test.
+  base::WaitableEvent done(false, false);
+  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
+      base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
+  done.Wait();
   db_thread_.Stop();
 }
 
 TemplateURLServiceTestUtil::TemplateURLServiceTestUtil()
     : ui_thread_(BrowserThread::UI, &message_loop_),
       changed_count_(0) {
 }
 
 TemplateURLServiceTestUtil::~TemplateURLServiceTestUtil() {
 }
@@ skipping 43 matching lines @@
   model()->Load();
   BlockTillServiceProcessesRequests();
   EXPECT_EQ(1, GetObserverCount());
   ResetObserverCount();
 }
 
 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_ = WebDataServiceFactory::GetForProfile(
+      profile_.get(), Profile::EXPLICIT_ACCESS);
 }
 
 void TemplateURLServiceTestUtil::ClearModel() {
   TemplateURLServiceFactory::GetInstance()->SetTestingFactory(
       profile_.get(), NULL);
 }
 
 void TemplateURLServiceTestUtil::ResetModel(bool verify_load) {
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       profile_.get(), TestingTemplateURLService::Build);
@@ skipping 25 matching lines @@
   return profile_.get();
 }
 
 void TemplateURLServiceTestUtil::StartIOThread() {
   profile_->StartIOThread();
 }
 
 void TemplateURLServiceTestUtil::PumpLoop() {
   message_loop_.RunAllPending();
 }