Revert of Replace AttachmentStore's StoreAttachments with UploadAttachments.

sync/internal_api/attachments/attachment_service_proxy_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_service_proxy.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 16 matching lines @@
                               public base::NonThreadSafe {
  public:
   StubAttachmentService() : call_count_(0), weak_ptr_factory_(this) {
     // DetachFromThread because we will be constructed in one thread and
     // used/destroyed in another.
     DetachFromThread();
   }
 
   virtual ~StubAttachmentService() {}
 
-  virtual AttachmentStore* GetStore() OVERRIDE { return NULL; }
-
   virtual void GetOrDownloadAttachments(const AttachmentIdList& attachment_ids,
                                         const GetOrDownloadCallback& callback)
       OVERRIDE {
     CalledOnValidThread();
     Increment();
     scoped_ptr<AttachmentMap> attachments(new AttachmentMap());
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback,
                    AttachmentService::GET_UNSPECIFIED_ERROR,
                    base::Passed(&attachments)));
   }
 
   virtual void DropAttachments(const AttachmentIdList& attachment_ids,
                                const DropCallback& callback) OVERRIDE {
     CalledOnValidThread();
     Increment();
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, AttachmentService::DROP_SUCCESS));
   }
 
-  virtual void UploadAttachments(
-      const AttachmentIdSet& attachments_ids) OVERRIDE {
+  virtual void StoreAttachments(const AttachmentList& attachments,
+                                const StoreCallback& callback) OVERRIDE {
     CalledOnValidThread();
     Increment();
+    base::MessageLoop::current()->PostTask(
+        FROM_HERE, base::Bind(callback, AttachmentService::STORE_SUCCESS));
   }
 
   virtual base::WeakPtr<AttachmentService> AsWeakPtr() {
     return weak_ptr_factory_.GetWeakPtr();
   }
 
   // Return the number of method invocations.
   int GetCallCount() const {
     base::AutoLock lock(mutex_);
     return call_count_;
@@ skipping 24 matching lines @@
     stub_thread->Start();
     stub.reset(new StubAttachmentService);
     proxy.reset(new AttachmentServiceProxy(stub_thread->message_loop_proxy(),
                                            stub->AsWeakPtr()));
 
     callback_get_or_download =
         base::Bind(&AttachmentServiceProxyTest::IncrementGetOrDownload,
                    base::Unretained(this));
     callback_drop = base::Bind(&AttachmentServiceProxyTest::IncrementDrop,
                                base::Unretained(this));
+    callback_store = base::Bind(&AttachmentServiceProxyTest::IncrementStore,
+                                base::Unretained(this));
     count_callback_get_or_download = 0;
     count_callback_drop = 0;
+    count_callback_store = 0;
   }
 
   virtual void TearDown()
       OVERRIDE {
     // We must take care to call the stub's destructor on the stub_thread
     // because that's the thread to which its WeakPtrs are bound.
     if (stub) {
       stub_thread->message_loop()->DeleteSoon(FROM_HERE, stub.release());
       WaitForStubThread();
     }
     stub_thread->Stop();
   }
 
   // a GetOrDownloadCallback
   void IncrementGetOrDownload(const AttachmentService::GetOrDownloadResult&,
                               scoped_ptr<AttachmentMap>) {
     CalledOnValidThread();
     ++count_callback_get_or_download;
   }
 
   // a DropCallback
   void IncrementDrop(const AttachmentService::DropResult&) {
     CalledOnValidThread();
     ++count_callback_drop;
   }
 
+  // a StoreCallback
+  void IncrementStore(const AttachmentService::StoreResult&) {
+    CalledOnValidThread();
+    ++count_callback_store;
+  }
+
   void WaitForStubThread() {
     base::WaitableEvent done(false, false);
     stub_thread->message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
     done.Wait();
   }
 
   base::MessageLoop loop;
   scoped_ptr<base::Thread> stub_thread;
   scoped_ptr<StubAttachmentService> stub;
   scoped_ptr<AttachmentServiceProxy> proxy;
 
   AttachmentService::GetOrDownloadCallback callback_get_or_download;
   AttachmentService::DropCallback callback_drop;
+  AttachmentService::StoreCallback callback_store;
 
   // number of times callback_get_or_download was invoked
   int count_callback_get_or_download;
   // number of times callback_drop was invoked
   int count_callback_drop;
+  // number of times callback_store was invoked
+  int count_callback_store;
 };
 
-TEST_F(AttachmentServiceProxyTest, GetStore) {
-  EXPECT_EQ(NULL, proxy->GetStore());
-}
-
-// Verify that each of AttachmentServiceProxy's methods are invoked on the stub.
-// Verify that the methods that take callbacks invoke passed callbacks on this
-// thread.
-TEST_F(AttachmentServiceProxyTest, MethodsAreProxied) {
+// Verify that each of AttachmentServiceProxy's callback methods (those that
+// take callbacks) are invoked on the stub and that the passed callbacks are
+// invoked in this thread.
+TEST_F(AttachmentServiceProxyTest, MethodsWithCallbacksAreProxied) {
   proxy->GetOrDownloadAttachments(AttachmentIdList(), callback_get_or_download);
   proxy->DropAttachments(AttachmentIdList(), callback_drop);
-  proxy->UploadAttachments(AttachmentIdSet());
+  proxy->StoreAttachments(AttachmentList(), callback_store);
   // Wait for the posted calls to execute in the stub thread.
   WaitForStubThread();
   EXPECT_EQ(3, stub->GetCallCount());
   // At this point the stub thread has finished executed the calls. However, the
   // result callbacks it has posted may not have executed yet. Wait a second
   // time to ensure the stub thread has executed the posted result callbacks.
   WaitForStubThread();
 
   loop.RunUntilIdle();
   EXPECT_EQ(1, count_callback_get_or_download);
   EXPECT_EQ(1, count_callback_drop);
+  EXPECT_EQ(1, count_callback_store);
 }
 
 // Verify that it's safe to use an AttachmentServiceProxy even after its wrapped
 // AttachmentService has been destroyed.
 TEST_F(AttachmentServiceProxyTest, WrappedIsDestroyed) {
   proxy->GetOrDownloadAttachments(AttachmentIdList(), callback_get_or_download);
   // Wait for the posted calls to execute in the stub thread.
   WaitForStubThread();
   EXPECT_EQ(1, stub->GetCallCount());
   // Wait a second time ensure the stub thread has executed the posted result
@@ skipping 10 matching lines @@
   // Now that the wrapped object has been destroyed, call again and see that we
   // don't crash and the count remains the same.
   proxy->GetOrDownloadAttachments(AttachmentIdList(), callback_get_or_download);
   WaitForStubThread();
   WaitForStubThread();
   loop.RunUntilIdle();
   EXPECT_EQ(1, count_callback_get_or_download);
 }
 
 }  // namespace syncer