Refactor AO2TS to make it easier to componentize.

chrome/browser/services/gcm/gcm_account_tracker_unittest.cc

 // Copyright 2014 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/services/gcm/gcm_account_tracker.h"
 
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 193 matching lines @@
   tracker_.reset(new GCMAccountTracker(gaia_account_tracker.Pass(), &driver_));
 }
 
 GCMAccountTrackerTest::~GCMAccountTrackerTest() {
   if (tracker_)
     tracker_->Shutdown();
 }
 
 void GCMAccountTrackerTest::StartAccountSignIn(const std::string& account_key) {
   fake_identity_provider_->LogIn(account_key);
-  fake_token_service_->AddAccount(account_key);
+  fake_token_service_->GetDelegate()->UpdateCredentials(account_key,
+                                                        "refresh_token");
 }
 
 void GCMAccountTrackerTest::FinishAccountSignIn(
     const std::string& account_key) {
   IssueAccessToken(account_key);
 
   net::TestURLFetcher* fetcher = test_fetcher_factory_.GetFetcherByID(
       gaia::GaiaOAuthClient::kUrlFetcherId);
   ASSERT_TRUE(fetcher);
   fetcher->set_response_code(net::HTTP_OK);
   fetcher->SetResponseString(GetValidTokenInfoResponse(account_key));
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 }
 
 void GCMAccountTrackerTest::SignInAccount(const std::string& account_key) {
   StartAccountSignIn(account_key);
   FinishAccountSignIn(account_key);
 }
 
 void GCMAccountTrackerTest::SignOutAccount(const std::string& account_key) {
-  fake_token_service_->RemoveAccount(account_key);
+  fake_token_service_->GetDelegate()->RevokeCredentials(account_key);
 }
 
 void GCMAccountTrackerTest::IssueAccessToken(const std::string& account_key) {
   fake_token_service_->IssueAllTokensForAccount(
       account_key, MakeAccessToken(account_key), base::Time::Max());
 }
 
 void GCMAccountTrackerTest::IssueExpiredAccessToken(
     const std::string& account_key) {
   fake_token_service_->IssueAllTokensForAccount(
@@ skipping 265 matching lines @@
   // but we have the update call.
   SignOutAccount(kAccountId1);
   EXPECT_TRUE(driver()->update_accounts_called());
   EXPECT_FALSE(IsTokenReportingRequired());
 }
 
 // TODO(fgorski): Add test for adding account after removal >> make sure it does
 // not mark removal.
 
 }  // namespace gcm