Refactor AO2TS to make it easier to componentize.

chrome/browser/chromeos/policy/upload_job_unittest.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.h"
 
 #include <queue>
 #include <set>
 #include <utility>
 
@@ skipping 54 matching lines @@
 
   // OAuth2TokenService:
   void FetchOAuth2Token(RequestImpl* request,
                         const std::string& account_id,
                         net::URLRequestContextGetter* getter,
                         const std::string& client_id,
                         const std::string& client_secret,
                         const ScopeSet& scopes) override;
 
   // OAuth2TokenService:
-  void InvalidateOAuth2Token(const std::string& account_id,
-                             const std::string& client_id,
-                             const ScopeSet& scopes,
-                             const std::string& access_token) override;
+  void InvalidateAccessTokenImpl(const std::string& account_id,
+                                 const std::string& client_id,
+                                 const ScopeSet& scopes,
+                                 const std::string& access_token) override;
 
   void AddTokenToQueue(const std::string& token);
   bool IsTokenValid(const std::string& token) const;
   void SetTokenValid(const std::string& token);
   void SetTokenInvalid(const std::string& token);
 
  private:
   std::queue<std::string> token_replies_;
   std::set<std::string> valid_tokens_;
 
@@ skipping 39 matching lines @@
 }
 
 void MockOAuth2TokenService::SetTokenValid(const std::string& token) {
   valid_tokens_.insert(token);
 }
 
 void MockOAuth2TokenService::SetTokenInvalid(const std::string& token) {
   valid_tokens_.erase(token);
 }
 
-void MockOAuth2TokenService::InvalidateOAuth2Token(
+void MockOAuth2TokenService::InvalidateAccessTokenImpl(
     const std::string& account_id,
     const std::string& client_id,
     const ScopeSet& scopes,
     const std::string& access_token) {
   SetTokenInvalid(access_token);
 }
 
 }  // namespace
 
 class UploadJobTestBase : public testing::Test, public UploadJob::Delegate {
@@ skipping 21 matching lines @@
   const GURL GetServerURL() const { return test_server_.GetURL(kUploadPath); }
 
   void SetExpectedError(scoped_ptr<UploadJob::ErrorCode> expected_error) {
     expected_error_ = expected_error.Pass();
   }
 
   // testing::Test:
   void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         base::ThreadTaskRunnerHandle::Get());
-    oauth2_service_.AddAccount("robot@gmail.com");
+    oauth2_service_.GetDelegate()->UpdateCredentials("robot@gmail.com",
+                                                     "refresh_token");
     ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
   }
 
   // testing::Test:
   void TearDown() override {
     ASSERT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
   }
 
  protected:
   scoped_ptr<UploadJob> PrepareUploadJob(scoped_ptr<
@@ skipping 142 matching lines @@
       "customfield2: CUSTOM2\r\n"
       "\r\n"
       "**||--||PAYLOAD2||--||**\r\n--"
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA--\r\n");
 
   upload_job->Start();
   run_loop_.Run();
 }
 
 }  // namespace policy