Refactor AO2TS to make it easier to componentize.

chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.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/supervised_user/child_accounts/permission_request_creator_apiary.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 214 matching lines @@
   if (!status.is_success()) {
     DispatchNetworkError(it, status.error());
     return;
   }
 
   int response_code = source->GetResponseCode();
   if (response_code == net::HTTP_UNAUTHORIZED && !(*it)->access_token_expired) {
     (*it)->access_token_expired = true;
     OAuth2TokenService::ScopeSet scopes;
     scopes.insert(GetApiScope());
-    oauth2_token_service_->InvalidateToken(account_id_,
-                                           scopes,
-                                           (*it)->access_token);
+    oauth2_token_service_->InvalidateAccessToken(account_id_, scopes,
+                                                 (*it)->access_token);
     StartFetching(*it);
     return;
   }
 
   if (response_code != net::HTTP_OK) {
     LOG(WARNING) << "HTTP error " << response_code;
     DispatchGoogleServiceAuthError(
         it, GoogleServiceAuthError(GoogleServiceAuthError::CONNECTION_FAILED));
     return;
   }
@@ skipping 26 matching lines @@
       it, GoogleServiceAuthError::FromConnectionError(error_code));
 }
 
 void PermissionRequestCreatorApiary::DispatchGoogleServiceAuthError(
     RequestIterator it,
     const GoogleServiceAuthError& error) {
   VLOG(1) << "GoogleServiceAuthError: " << error.ToString();
   (*it)->callback.Run(false);
   requests_.erase(it);
 }