Refactor AO2TS to make it easier to componentize.

extensions/browser/updater/extension_downloader.cc

 // Copyright (c) 2012 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 "extensions/browser/updater/extension_downloader.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 897 matching lines @@
       return true;
     case ExtensionFetch::CREDENTIALS_OAUTH2_TOKEN:
       fetch->oauth2_attempt_count++;
       // OAuth2 may fail due to an expired access token, in which case we
       // should invalidate the token and try again.
       if (response_code == net::HTTP_UNAUTHORIZED &&
           fetch->oauth2_attempt_count <= kMaxOAuth2Attempts) {
         DCHECK(identity_provider_.get());
         OAuth2TokenService::ScopeSet webstore_scopes;
         webstore_scopes.insert(kWebstoreOAuth2Scope);
-        identity_provider_->GetTokenService()->InvalidateToken(
-            identity_provider_->GetActiveAccountId(),
-            webstore_scopes,
+        identity_provider_->GetTokenService()->InvalidateAccessToken(
+            identity_provider_->GetActiveAccountId(), webstore_scopes,
             access_token_);
         access_token_.clear();
         return true;
       }
       // Either there is no Gaia identity available, the active identity
       // doesn't have access to this resource, or the server keeps returning
       // 401s and we've retried too many times. Fall back on cookies.
       if (access_token_.empty() || response_code == net::HTTP_FORBIDDEN ||
           fetch->oauth2_attempt_count > kMaxOAuth2Attempts) {
         fetch->credentials = ExtensionFetch::CREDENTIALS_COOKIES;
@@ skipping 38 matching lines @@
     const GURL& update_url,
     int request_id) {
   ManifestFetchData::PingMode ping_mode = ManifestFetchData::NO_PING;
   if (update_url.DomainIs(ping_enabled_domain_.c_str()))
     ping_mode = ManifestFetchData::PING_WITH_ENABLED_STATE;
   return new ManifestFetchData(
       update_url, request_id, brand_code_, manifest_query_params_, ping_mode);
 }
 
 }  // namespace extensions