Refactor AO2TS to make it easier to componentize.

chrome/browser/chromeos/policy/upload_job_impl.cc

 // Copyright (c) 2015 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/chromeos/policy/upload_job_impl.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 370 matching lines @@
       LOG(ERROR) << "Unauthorized request.";
       state_ = ERROR;
       post_data_.reset();
       delegate_->OnFailure(AUTHENTICATION_ERROR);
       return;
     }
     retry_++;
     upload_fetcher_.reset();
     OAuth2TokenService::ScopeSet scope_set;
     scope_set.insert(GaiaConstants::kDeviceManagementServiceOAuth);
-    token_service_->InvalidateToken(account_id_, scope_set, access_token_);
+    token_service_->InvalidateAccessToken(account_id_, scope_set,
+                                          access_token_);
     access_token_.clear();
     RequestAccessToken();
     return;
   }
 
   upload_fetcher_.reset();
   access_token_.clear();
   upload_fetcher_.reset();
   post_data_.reset();
   if (success) {
     state_ = SUCCESS;
     delegate_->OnSuccess();
   } else {
     state_ = ERROR;
     delegate_->OnFailure(SERVER_ERROR);
   }
 }
 
 }  // namespace policy