Refactor AO2TS to make it easier to componentize.

components/signin/ios/browser/profile_oauth2_token_service_ios.mm

 // 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 "components/signin/ios/browser/profile_oauth2_token_service_ios.h"
 
 #include <Foundation/Foundation.h>
 
 #include <set>
 #include <string>
@@ skipping 291 matching lines @@
 }
 
 OAuth2AccessTokenFetcher*
 ProfileOAuth2TokenServiceIOS::CreateAccessTokenFetcher(
     const std::string& account_id,
     net::URLRequestContextGetter* getter,
     OAuth2AccessTokenConsumer* consumer) {
   return new SSOAccessTokenFetcher(consumer, GetProvider(), account_id);
 }
 
-void ProfileOAuth2TokenServiceIOS::InvalidateOAuth2Token(
+void ProfileOAuth2TokenServiceIOS::InvalidateAccessToken(
     const std::string& account_id,
     const std::string& client_id,
     const ScopeSet& scopes,
     const std::string& access_token) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  // Call |ProfileOAuth2TokenService::InvalidateOAuth2Token| to clear the
+  // Call |ProfileOAuth2TokenService::InvalidateAccessToken| to clear the
   // cached access token.
-  ProfileOAuth2TokenService::InvalidateOAuth2Token(account_id,
-                                                   client_id,
-                                                   scopes,
-                                                   access_token);
+  ProfileOAuth2TokenService::InvalidateAccessToken(account_id, client_id,
+                                                   scopes, access_token);
 
   // There is no need to inform the authentication library that the access
   // token is invalid as it never caches the token.
 }
 
 std::vector<std::string> ProfileOAuth2TokenServiceIOS::GetAccounts() {
   DCHECK(thread_checker_.CalledOnValidThread());
   std::vector<std::string> account_ids;
   for (auto i = accounts_.begin(); i != accounts_.end(); ++i)
     account_ids.push_back(i->first);
@@ skipping 155 matching lines @@
   client()->GetPrefs()->SetBoolean(
       prefs::kTokenServiceExcludeAllSecondaryAccounts, true);
 }
 
 void ProfileOAuth2TokenServiceIOS::ClearExcludedSecondaryAccounts() {
   client()->GetPrefs()->ClearPref(
       prefs::kTokenServiceExcludeAllSecondaryAccounts);
   client()->GetPrefs()->ClearPref(
       prefs::kTokenServiceExcludedSecondaryAccounts);
 }