Update sync API to support attachments.

sync/api/attachments/attachment.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/attachment.h"
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 
 namespace syncer {
 
 Attachment::~Attachment() {}
 
 // Static.
-scoped_ptr<Attachment> Attachment::Create(
+sync_pb::AttachmentId Attachment::CreateId() {
+  sync_pb::AttachmentId result;
+  // Only requirement here is that this id must be globally unique.
+  // TODO(maniscalco): Consider making this base64 encoded.
+  result.set_unique_id(base::RandBytesAsString(16));
+  return result;
+}
+
+// Static.
+Attachment Attachment::Create(
     const scoped_refptr<base::RefCountedMemory>& data) {
   return CreateWithId(CreateId(), data);
 }
 
 // Static.
-scoped_ptr<Attachment> Attachment::CreateWithId(
+Attachment Attachment::CreateWithId(
     const sync_pb::AttachmentId& id,
     const scoped_refptr<base::RefCountedMemory>& data) {
-  return scoped_ptr<Attachment>(new Attachment(id, data)).Pass();
+  return Attachment(id, data);
 }
 
 const sync_pb::AttachmentId& Attachment::GetId() const { return id_; }
 
 const scoped_refptr<base::RefCountedMemory>& Attachment::GetData() const {
   return data_;
 }
 
 Attachment::Attachment(const sync_pb::AttachmentId& id,
                        const scoped_refptr<base::RefCountedMemory>& data)
     : id_(id), data_(data) {
   DCHECK(!id.unique_id().empty());
   DCHECK(data);
 }
 
-// Static.
-sync_pb::AttachmentId Attachment::CreateId() {
-  sync_pb::AttachmentId result;
-  // Only requirement here is that this id must be globally unique.
-  // TODO(maniscalco): Consider making this base64 encoded.
-  result.set_unique_id(base::RandBytesAsString(16));
-  return result;
-}
-
 }  // namespace syncer