Update sync API to support attachments.

sync/api/attachments/fake_attachment_store.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/api/attachments/fake_attachment_store.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 11 matching lines @@
   Backend(
       const scoped_refptr<base::SingleThreadTaskRunner>& frontend_task_runner);
 
   void Read(const sync_pb::AttachmentId& id, const ReadCallback& callback);
   void Write(const scoped_refptr<base::RefCountedMemory>& bytes,
              const WriteCallback& callback);
   void Drop(const sync_pb::AttachmentId& id, const DropCallback& callback);
 
  private:
   friend class base::RefCountedThreadSafe<Backend>;
-  typedef std::string UniqueId;
-  typedef std::map<UniqueId, Attachment*> AttachmentMap;
 
   ~Backend();
-  Result Remove(const sync_pb::AttachmentId& id);
 
   scoped_refptr<base::SingleThreadTaskRunner> frontend_task_runner_;
   AttachmentMap attachments_;
-  STLValueDeleter<AttachmentMap> attachments_value_deleter_;
 };
 
 FakeAttachmentStore::Backend::Backend(
     const scoped_refptr<base::SingleThreadTaskRunner>& frontend_task_runner)
-    : frontend_task_runner_(frontend_task_runner),
-      attachments_value_deleter_(&attachments_) {}
+    : frontend_task_runner_(frontend_task_runner) {}
 
 FakeAttachmentStore::Backend::~Backend() {}
 
 void FakeAttachmentStore::Backend::Read(const sync_pb::AttachmentId& id,
                                         const ReadCallback& callback) {
   AttachmentMap::iterator iter = attachments_.find(id.unique_id());
   scoped_ptr<Attachment> attachment;
   Result result = NOT_FOUND;
   if (iter != attachments_.end()) {
-    attachment.reset(new Attachment(*iter->second));
+    attachment.reset(new Attachment(iter->second));
     result = SUCCESS;
   }
   frontend_task_runner_->PostTask(
       FROM_HERE, base::Bind(callback, result, base::Passed(&attachment)));
 }
 
 void FakeAttachmentStore::Backend::Write(
     const scoped_refptr<base::RefCountedMemory>& bytes,
     const WriteCallback& callback) {
-  scoped_ptr<Attachment> attachment = Attachment::Create(bytes);
-  DCHECK(attachment.get());
-  sync_pb::AttachmentId attachment_id(attachment->GetId());
-  attachments_.insert(AttachmentMap::value_type(attachment_id.unique_id(),
-                                                attachment.release()));
+  Attachment attachment = Attachment::Create(bytes);
+  sync_pb::AttachmentId attachment_id(attachment.GetId());
+  attachments_.insert(
+      AttachmentMap::value_type(attachment_id.unique_id(), attachment));
   frontend_task_runner_->PostTask(FROM_HERE,
                                   base::Bind(callback, SUCCESS, attachment_id));
 }
 
 void FakeAttachmentStore::Backend::Drop(const sync_pb::AttachmentId& id,
                                         const DropCallback& callback) {
-  Result result = Remove(id);
+  Result result = NOT_FOUND;
+  AttachmentMap::iterator iter = attachments_.find(id.unique_id());
+  if (iter != attachments_.end()) {
+    attachments_.erase(iter);
+    result = SUCCESS;
+  }
   frontend_task_runner_->PostTask(FROM_HERE, base::Bind(callback, result));
 }
 
-AttachmentStore::Result FakeAttachmentStore::Backend::Remove(
-    const sync_pb::AttachmentId& id) {
-  Result result = NOT_FOUND;
-  AttachmentMap::iterator iter = attachments_.find(id.unique_id());
-  if (iter != attachments_.end()) {
-    delete iter->second;
-    attachments_.erase(iter);
-    result = SUCCESS;
-  }
-  return result;
-}
-
 FakeAttachmentStore::FakeAttachmentStore(
     const scoped_refptr<base::SequencedTaskRunner>& backend_task_runner)
     : backend_(new Backend(base::MessageLoopProxy::current())),
       backend_task_runner_(backend_task_runner) {}
 
 FakeAttachmentStore::~FakeAttachmentStore() {}
 
 void FakeAttachmentStore::Read(const sync_pb::AttachmentId& id,
                                const ReadCallback& callback) {
   backend_task_runner_->PostTask(
@@ skipping 11 matching lines @@
 }
 
 void FakeAttachmentStore::Drop(const sync_pb::AttachmentId& id,
                                const DropCallback& callback) {
   backend_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&FakeAttachmentStore::Backend::Drop, backend_, id, callback));
 }
 
 }  // namespace syncer