Refactor AO2TS to make it easier to componentize.

google_apis/gaia/ubertoken_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 "google_apis/gaia/ubertoken_fetcher.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 51 matching lines @@
       retry_timer_.Start(FROM_HERE,
                          base::TimeDelta::FromSecondsD(backoff),
                          this,
                          &UbertokenFetcher::ExchangeTokens);
       return;
     }
   } else {
     // The access token is invalid.  Tell the token service.
     OAuth2TokenService::ScopeSet scopes;
     scopes.insert(GaiaConstants::kOAuth1LoginScope);
-    token_service_->InvalidateToken(account_id_, scopes, access_token_);
+    token_service_->InvalidateAccessToken(account_id_, scopes, access_token_);
 
     // In case the access was just stale, try one more time.
     if (!second_access_token_request_) {
       second_access_token_request_ = true;
       RequestAccessToken();
       return;
     }
   }
 
   consumer_->OnUbertokenFailure(error);
@@ skipping 26 matching lines @@
   access_token_request_ =
       token_service_->StartRequest(account_id_, scopes, this);
 }
 
 void UbertokenFetcher::ExchangeTokens() {
   gaia_auth_fetcher_.reset(new GaiaAuthFetcher(this,
                                                source_,
                                                request_context_));
   gaia_auth_fetcher_->StartTokenFetchForUberAuthExchange(access_token_);
 }