Split token-related methods from WebDataService

chrome/browser/signin/token_service_unittest.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.
 //
 // This file defines a unit test for the profile's token service.
 
 #include "chrome/browser/signin/token_service_unittest.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/signin/token_service_factory.h"
-#include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/browser/webdata/token_web_data.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/webdata/encryptor/encryptor.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/mock_url_fetcher_factory.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 
 using content::BrowserThread;
 
 TokenAvailableTracker::TokenAvailableTracker() {}
@@ skipping 71 matching lines @@
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
   done.Wait();
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
   db_thread_.Stop();
 }
 
 void TokenServiceTestHarness::WaitForDBLoadCompletion() {
   // Force the loading of the WebDataService.
-  WebDataService::FromBrowserContext(profile_.get());
+  TokenWebData::FromBrowserContext(profile_.get());
 
   // The WebDB does all work on the DB thread. This will add an event
   // to the end of the DB thread, so when we reach this task, all DB
   // operations should be complete.
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::DB,
       FROM_HERE,
       base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
   done.Wait();
@@ skipping 300 matching lines @@
 
     *CommandLine::ForCurrentProcess() = original_cl;
   }
 };
 
 TEST_F(TokenServiceCommandLineTest, TestValueOverride) {
   EXPECT_TRUE(service_->HasTokenForService("my_service"));
   EXPECT_EQ("my_value", service_->GetTokenForService("my_service"));
 }
 #endif   // ifndef NDEBUG