Refactor AO2TS to make it easier to componentize.

sync/internal_api/attachments/attachment_downloader_impl_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 "sync/internal_api/public/attachments/attachment_downloader_impl.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 36 matching lines @@
   int num_invalidate_token() const { return num_invalidate_token_; }
 
  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:
   base::WeakPtr<RequestImpl> last_request_;
   int num_invalidate_token_;
 };
 
 void MockOAuth2TokenService::RespondToAccessTokenRequest(
     GoogleServiceAuthError error) {
   EXPECT_TRUE(last_request_ != NULL);
   std::string access_token;
@@ skipping 16 matching lines @@
     const std::string& account_id,
     net::URLRequestContextGetter* getter,
     const std::string& client_id,
     const std::string& client_secret,
     const ScopeSet& scopes) {
   // Only one request at a time is allowed.
   EXPECT_TRUE(last_request_ == NULL);
   last_request_ = request->AsWeakPtr();
 }
 
-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_;
 }
 
 class TokenServiceProvider
     : public OAuth2TokenServiceRequest::TokenServiceProvider,
       base::NonThreadSafe {
@@ skipping 93 matching lines @@
   ResultsMap download_results_;
   int num_completed_downloads_;
   const AttachmentId attachment_id_;
 };
 
 void AttachmentDownloaderImplTest::SetUp() {
   url_request_context_getter_ =
       new net::TestURLRequestContextGetter(message_loop_.task_runner());
   url_fetcher_factory_.set_remove_fetcher_on_delete(true);
   token_service_.reset(new MockOAuth2TokenService());
-  token_service_->AddAccount(kAccountId);
+  token_service_->GetDelegate()->UpdateCredentials(kAccountId, "refresh_token");
   scoped_refptr<OAuth2TokenServiceRequest::TokenServiceProvider>
       token_service_provider(new TokenServiceProvider(token_service_.get()));
 
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kChromeSyncOAuth2Scope);
   attachment_downloader_ = AttachmentDownloader::Create(
       GURL(kAttachmentServerUrl), url_request_context_getter_, kAccountId,
       scopes, token_service_provider, std::string(kStoreBirthday), kModelType);
 }
 
@@ skipping 306 matching lines @@
   raw += "\n";
   std::replace(raw.begin(), raw.end(), '\n', '\0');
   scoped_refptr<net::HttpResponseHeaders> headers(
       new net::HttpResponseHeaders(raw));
   uint32_t extracted;
   ASSERT_FALSE(
       AttachmentDownloaderImpl::ExtractCrc32c(headers.get(), &extracted));
 }
 
 }  // namespace syncer