Refactor AO2TS to make it easier to componentize.

sync/internal_api/attachments/attachment_uploader_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_uploader_impl.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ 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 TokenServiceProvider
     : public OAuth2TokenServiceRequest::TokenServiceProvider,
@@ skipping 160 matching lines @@
   for (int i = 0; i < num_uploads; ++i) {
     // Run the loop until one upload completes.
     base::RunLoop run_loop;
     signal_upload_done_ = run_loop.QuitClosure();
     run_loop.Run();
   }
 }
 
 Attachment AttachmentUploaderImplTest::UploadAndRespondWith(
     const net::HttpStatusCode& status_code) {
-  token_service().AddAccount(kAccountId);
+  token_service().GetDelegate()->UpdateCredentials(kAccountId, "refresh_token");
   request_handler().SetStatusCode(status_code);
   scoped_refptr<base::RefCountedString> some_data(new base::RefCountedString);
   some_data->data() = kAttachmentData;
   Attachment attachment = Attachment::Create(some_data);
   uploader()->UploadAttachment(attachment, upload_callback());
   return attachment;
 }
 
 scoped_ptr<AttachmentUploader>& AttachmentUploaderImplTest::uploader() {
   return uploader_;
@@ skipping 339 matching lines @@
   scoped_refptr<base::RefCountedString> hello_world(new base::RefCountedString);
   hello_world->data() = "hello world";
   EXPECT_EQ("yZRlqg==", AttachmentUploaderImpl::FormatCrc32cHash(
                             ComputeCrc32c(hello_world)));
 }
 
 // TODO(maniscalco): Add test case for when we are uploading an attachment that
 // already exists.  409 Conflict? (bug 379825)
 
 }  // namespace syncer