Revert of Create signin component and componentize TokenWebData.

chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc

 // Copyright 2013 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 "base/run_loop.h"
 #include "chrome/browser/signin/mutable_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_account_id_helper.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/webdata/web_data_service_factory.h"
+#include "chrome/browser/webdata/token_web_data.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/signin/core/webdata/token_web_data.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/oauth2_token_service_test_util.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_MACOSX)
 #include "components/webdata/encryptor/encryptor.h"
@@ skipping 45 matching lines @@
   TestingProfile* profile() { return profile_.get(); }
 
   void SetupSigninManager(const std::string& username) {
     SigninManagerFactory::GetForProfile(profile())->
         SetAuthenticatedUsername(username);
   }
 
   void AddAuthTokenManually(const std::string& service,
                             const std::string& value)  {
     scoped_refptr<TokenWebData> token_web_data =
-        WebDataServiceFactory::GetTokenWebDataForProfile(
-            profile(), Profile::EXPLICIT_ACCESS);
+        TokenWebData::FromBrowserContext(profile());
     if (token_web_data.get())
       token_web_data->SetTokenForService(service, value);
   }
 
   // OAuth2TokenService::Observer implementation.
   virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE {
     ++token_available_count_;
   }
   virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE {
     ++token_revoked_count_;
@@ skipping 262 matching lines @@
                                      "refreshToken");
   ExpectOneTokenAvailableNotification();
 
   scoped_ptr<OAuth2TokenService::Request> request(oauth2_service_->StartRequest(
       oauth2_service_->GetPrimaryAccountId(), scope_list, &consumer_));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(GoogleServiceAuthError::AuthErrorNone(),
       oauth2_service_->signin_global_error()->GetLastAuthError());
 }