Refactor AO2TS to make it easier to componentize.

google_apis/gaia/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 "google_apis/gaia/account_tracker.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 283 matching lines @@
 
   // Helpers to pass fake events to the tracker.
 
   void NotifyLogin(const std::string account_key) {
     identity_provider()->LogIn(account_key);
   }
 
   void NotifyLogout() { identity_provider()->LogOut(); }
 
   void NotifyTokenAvailable(const std::string& username) {
-    fake_oauth2_token_service_->AddAccount(username);
+    fake_oauth2_token_service_->GetDelegate()->UpdateCredentials(
+        username, "refresh_token");
   }
 
   void NotifyTokenRevoked(const std::string& username) {
-    fake_oauth2_token_service_->RemoveAccount(username);
+    fake_oauth2_token_service_->GetDelegate()->RevokeCredentials(username);
   }
 
   // Helpers to fake access token and user info fetching
   void IssueAccessToken(const std::string& username) {
     fake_oauth2_token_service_->IssueAllTokensForAccount(
         username, "access_token-" + username, base::Time::Max());
   }
 
   std::string GetValidTokenInfoResponse(const std::string account_key) {
     return std::string("{ \"id\": \"") + AccountKeyToObfuscatedId(account_key) +
@@ skipping 487 matching lines @@
   EXPECT_TRUE(ids.email.empty());
   EXPECT_TRUE(ids.gaia.empty());
 
   ids = account_tracker()->FindAccountIdsByGaiaId("alpha@example.com");
   EXPECT_TRUE(ids.account_key.empty());
   EXPECT_TRUE(ids.email.empty());
   EXPECT_TRUE(ids.gaia.empty());
 }
 
 }  // namespace gaia