Refactor AO2TS to make it easier to componentize.

chrome/browser/extensions/api/identity/identity_apitest.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 <set>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 573 matching lines @@
     AccountTrackerService* account_tracker =
         AccountTrackerServiceFactory::GetForProfile(profile());
     std::string account_id =
         account_tracker->SeedAccountInfo(gaia, email);
 
 #if defined(OS_CHROMEOS)
     signin_manager_->SetAuthenticatedAccountInfo(gaia, email);
 #else
     signin_manager_->SignIn(gaia, email, "password");
 #endif
-    token_service_->IssueRefreshTokenForUser(account_id, "refresh_token");
+    token_service_->UpdateCredentials(account_id, "refresh_token");
   }
 
   FakeSigninManagerForTesting* signin_manager_;
   FakeProfileOAuth2TokenService* token_service_;
 
   scoped_ptr<base::CallbackList<void(content::BrowserContext*)>::Subscription>
       will_create_browser_context_services_subscription_;
 };
 
 class IdentityGetProfileUserInfoFunctionTest : public IdentityTestWithSignin {
@@ skipping 57 matching lines @@
 }
 
 class GetAuthTokenFunctionTest : public IdentityTestWithSignin {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     IdentityTestWithSignin::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kExtensionsMultiAccount);
   }
 
   void IssueLoginRefreshTokenForAccount(const std::string account_key) {
-    token_service_->IssueRefreshTokenForUser(account_key, "refresh_token");
+    token_service_->UpdateCredentials(account_key, "refresh_token");
   }
 
   void IssueLoginAccessTokenForAccount(const std::string account_key) {
     token_service_->IssueAllTokensForAccount(
         account_key,
         "access_token-" + account_key,
         base::Time::Now() + base::TimeDelta::FromSeconds(3600));
   }
 
   void SetAccountState(gaia::AccountIds ids, bool is_signed_in) {
@@ skipping 1143 matching lines @@
   EXPECT_EQ(std::string("https://abcdefghij.chromiumapp.org/callback#test"),
             url);
 }
 
 }  // namespace extensions
 
 // Tests the chrome.identity API implemented by custom JS bindings .
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeIdentityJsBindings) {
   ASSERT_TRUE(RunExtensionTest("identity/js_bindings")) << message_;
 }