Refactor AO2TS to make it easier to componentize.

components/signin/core/browser/account_tracker_service_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 <algorithm>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 246 matching lines @@
     account_tracker_->EnableNetworkFetches();
     account_tracker_->AddObserver(&observer_);
   }
 
   void TearDown() override {
     account_tracker_->RemoveObserver(&observer_);
     account_tracker_->Shutdown();
   }
 
   void SimulateTokenAvailable(const std::string& account_id) {
-    fake_oauth2_token_service_->AddAccount(account_id);
+    fake_oauth2_token_service_->GetDelegate()->UpdateCredentials(
+        account_id, "refresh_token");
   }
 
   void SimulateTokenRevoked(const std::string& account_id) {
-    fake_oauth2_token_service_->RemoveAccount(account_id);
+    fake_oauth2_token_service_->GetDelegate()->RevokeCredentials(account_id);
   }
 
   // Helpers to fake access token and user info fetching
   void IssueAccessToken(const std::string& account_id) {
     fake_oauth2_token_service_->IssueAllTokensForAccount(
         account_id, "access_token-" + account_id, base::Time::Max());
   }
 
   std::string GenerateValidTokenInfoResponse(const std::string& account_id) {
     return base::StringPrintf(
@@ skipping 450 matching lines @@
         tracker.GetAccounts();
     ASSERT_EQ(2u, infos.size());
     ASSERT_TRUE(infos[0].IsValid());
     ASSERT_TRUE(infos[1].IsValid());
 
     tracker.EnableNetworkFetches();
     ASSERT_FALSE(tracker.IsAllUserInfoFetched());
     tracker.Shutdown();
   }
 }