Update sync API to support attachments.

sync/api/attachments/attachment_unittest.cc

Index: sync/api/attachments/attachment_unittest.cc
diff --git a/sync/api/attachments/attachment_unittest.cc b/sync/api/attachments/attachment_unittest.cc
index 213d7f2c346ccbf6e3ab778b2f282ad23219da0f..d96d5437a0f0a479956bd6c5df79ae16c588fb9d 100644
--- a/sync/api/attachments/attachment_unittest.cc
+++ b/sync/api/attachments/attachment_unittest.cc
@@ -8,7 +8,6 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/memory/scoped_ptr.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -34,17 +33,17 @@ TEST_F(AttachmentTest, Create_UniqueIdIsUnique) {
   AttachmentId id;
   scoped_refptr<base::RefCountedString> some_data(new base::RefCountedString);
   some_data->data() = kAttachmentData;
-  scoped_ptr<Attachment> a1 = Attachment::Create(some_data);
-  scoped_ptr<Attachment> a2 = Attachment::Create(some_data);
-  EXPECT_NE(a1->GetId().unique_id(), a2->GetId().unique_id());
-  EXPECT_EQ(a1->GetData(), a2->GetData());
+  Attachment a1 = Attachment::Create(some_data);
+  Attachment a2 = Attachment::Create(some_data);
+  EXPECT_NE(a1.GetId().unique_id(), a2.GetId().unique_id());
+  EXPECT_EQ(a1.GetData(), a2.GetData());
 }
 
 TEST_F(AttachmentTest, Create_WithEmptyData) {
   AttachmentId id;
-  scoped_refptr<base::RefCountedString> emptyData(new base::RefCountedString);
-  scoped_ptr<Attachment> a = Attachment::Create(emptyData);
-  EXPECT_EQ(emptyData, a->GetData());
+  scoped_refptr<base::RefCountedString> empty_data(new base::RefCountedString);
+  Attachment a = Attachment::Create(empty_data);
+  EXPECT_EQ(empty_data, a.GetData());
 }
 
 TEST_F(AttachmentTest, CreateWithId_HappyCase) {
@@ -52,9 +51,9 @@ TEST_F(AttachmentTest, CreateWithId_HappyCase) {
   id.set_unique_id("3290482049832");
   scoped_refptr<base::RefCountedString> some_data(new base::RefCountedString);
   some_data->data() = kAttachmentData;
-  scoped_ptr<Attachment> a = Attachment::CreateWithId(id, some_data);
-  EXPECT_EQ(id.unique_id(), a->GetId().unique_id());
-  EXPECT_EQ(some_data, a->GetData());
+  Attachment a = Attachment::CreateWithId(id, some_data);
+  EXPECT_EQ(id.unique_id(), a.GetId().unique_id());
+  EXPECT_EQ(some_data, a.GetData());
 }
 
 }  // namespace syncer