Refactor AO2TS to make it easier to componentize.

chrome/browser/supervised_user/legacy/supervised_user_refresh_token_fetcher.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/legacy/supervised_user_refresh_token_fetcher.h"
 
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ skipping 187 matching lines @@
     const URLFetcher* source) {
   const net::URLRequestStatus& status = source->GetStatus();
   if (!status.is_success()) {
     DispatchNetworkError(status.error());
     return;
   }
 
   int response_code = source->GetResponseCode();
   if (response_code == net::HTTP_UNAUTHORIZED && !access_token_expired_) {
     access_token_expired_ = true;
-    oauth2_token_service_->InvalidateToken(account_id_,
-                                           OAuth2TokenService::ScopeSet(),
-                                           access_token_);
+    oauth2_token_service_->InvalidateAccessToken(
+        account_id_, OAuth2TokenService::ScopeSet(), access_token_);
     StartFetching();
     return;
   }
 
   if (response_code != net::HTTP_OK) {
     // TODO(bauerb): We should return the HTTP response code somehow.
     DLOG(WARNING) << "HTTP error " << response_code;
     DispatchGoogleServiceAuthError(
         GoogleServiceAuthError(GoogleServiceAuthError::CONNECTION_FAILED),
         std::string());
@@ skipping 77 matching lines @@
     URLRequestContextGetter* context) {
   scoped_ptr<SupervisedUserRefreshTokenFetcher> fetcher(
       new SupervisedUserRefreshTokenFetcherImpl(oauth2_token_service,
                                                 account_id,
                                                 device_id,
                                                 context));
   return fetcher.Pass();
 }
 
 SupervisedUserRefreshTokenFetcher::~SupervisedUserRefreshTokenFetcher() {}