Refactor AO2TS to make it easier to componentize.

google_apis/gaia/oauth2_token_service_request_unittest.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/oauth2_token_service_request.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 72 matching lines @@
   }
 
  protected:
   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;
 
-  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;
 
  private:
   GoogleServiceAuthError response_error_;
   std::string response_access_token_;
   base::Time response_expiration_;
   int num_invalidate_token_;
   std::string last_token_invalidated_;
 };
 
 MockOAuth2TokenService::MockOAuth2TokenService()
@@ skipping 23 matching lines @@
     const ScopeSet& scopes) {
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&OAuth2TokenService::RequestImpl::InformConsumer,
                  request->AsWeakPtr(),
                  response_error_,
                  response_access_token_,
                  response_expiration_));
 }
 
-void MockOAuth2TokenService::InvalidateOAuth2Token(
+void MockOAuth2TokenService::InvalidateAccessTokenImpl(
     const std::string& account_id,
     const std::string& client_id,
     const ScopeSet& scopes,
     const std::string& access_token) {
   ++num_invalidate_token_;
   last_token_invalidated_ = access_token;
 }
 
 class OAuth2TokenServiceRequestTest : public testing::Test {
  public:
@@ skipping 20 matching lines @@
   base::MessageLoop ui_loop_;
   OAuth2TokenService::ScopeSet scopes_;
   scoped_ptr<MockOAuth2TokenService> oauth2_service_;
   scoped_refptr<OAuth2TokenServiceRequest::TokenServiceProvider> provider_;
   TestingOAuth2TokenServiceConsumer consumer_;
 };
 
 void OAuth2TokenServiceRequestTest::SetUp() {
   scopes_.insert(kScope);
   oauth2_service_.reset(new MockOAuth2TokenService);
-  oauth2_service_->AddAccount(kAccountId);
+  oauth2_service_->GetDelegate()->UpdateCredentials(kAccountId,
+                                                    "refresh_token");
   provider_ =
       new Provider(base::ThreadTaskRunnerHandle::Get(), oauth2_service_.get());
 }
 
 void OAuth2TokenServiceRequestTest::TearDown() {
   // Run the loop to execute any pending tasks that may free resources.
   ui_loop_.RunUntilIdle();
 }
 
 OAuth2TokenServiceRequestTest::Provider::Provider(
@@ skipping 70 matching lines @@
   OAuth2TokenServiceRequest::InvalidateToken(
       provider_.get(), kAccountId, scopes_, kAccessToken);
   ui_loop_.RunUntilIdle();
   EXPECT_EQ(0, consumer_.num_get_token_success_);
   EXPECT_EQ(0, consumer_.num_get_token_failure_);
   EXPECT_EQ(kAccessToken, oauth2_service_->last_token_invalidated());
   EXPECT_EQ(1, oauth2_service_->num_invalidate_token());
 }
 
 }  // namespace