Moved WebDataService to ProfileKeyedService

chrome/browser/signin/token_service_unittest.cc

Index: chrome/browser/signin/token_service_unittest.cc
diff --git a/chrome/browser/signin/token_service_unittest.cc b/chrome/browser/signin/token_service_unittest.cc
index 68880ce52b99902a97b1ac2931c325fb3ba91e99..ff62f3db400d378e27efcf91c86a74cb082496d7 100644
--- a/chrome/browser/signin/token_service_unittest.cc
+++ b/chrome/browser/signin/token_service_unittest.cc
@@ -13,6 +13,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/signin/token_service_factory.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/mock_url_fetcher_factory.h"
@@ -72,7 +73,6 @@ void TokenServiceTestHarness::SetUp() {
   ASSERT_TRUE(db_thread_.Start());
 
   profile_.reset(new TestingProfile());
-  profile_->CreateWebDataService(false);
   WaitForDBLoadCompletion();
   service_ = TokenServiceFactory::GetForProfile(profile_.get());
 
@@ -90,6 +90,9 @@ void TokenServiceTestHarness::TearDown() {
     profile_.reset(NULL);
   }
 
+  BrowserThread::UnsafeGetMessageLoopForThread(
+      BrowserThread::DB)->RunAllPending();
+
   db_thread_.Stop();
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   MessageLoop::current()->Run();