Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / sync / api / sync_data_unittest.cc

diff --git a/src/sync/api/sync_data_unittest.cc b/src/sync/api/sync_data_unittest.cc
index 92aa687..a0a83cd 100644 (file)
--- a/src/sync/api/sync_data_unittest.cc
+++ b/src/sync/api/sync_data_unittest.cc
@@ -71,30 +71,28 @@ TEST_F(SyncDataTest, CreateLocalData) {
 
 TEST_F(SyncDataTest, CreateLocalDataWithAttachments) {
   specifics.mutable_preference();
-  scoped_refptr<base::RefCountedMemory> bytes(new base::RefCountedString);
-  AttachmentList attachments;
-  attachments.push_back(Attachment::Create(bytes));
-  attachments.push_back(Attachment::Create(bytes));
-  attachments.push_back(Attachment::Create(bytes));
+  AttachmentIdList attachment_ids;
+  attachment_ids.push_back(AttachmentId::Create());
+  attachment_ids.push_back(AttachmentId::Create());
+  attachment_ids.push_back(AttachmentId::Create());
 
   SyncData data = SyncData::CreateLocalDataWithAttachments(
-      kSyncTag, kNonUniqueTitle, specifics, attachments);
+      kSyncTag, kNonUniqueTitle, specifics, attachment_ids);
   EXPECT_TRUE(data.IsValid());
   EXPECT_TRUE(data.IsLocal());
   EXPECT_EQ(kSyncTag, SyncDataLocal(data).GetTag());
   EXPECT_EQ(kDatatype, data.GetDataType());
   EXPECT_EQ(kNonUniqueTitle, data.GetTitle());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
-  AttachmentIdList attachment_ids = data.GetAttachmentIds();
+  attachment_ids = data.GetAttachmentIds();
   EXPECT_EQ(3U, attachment_ids.size());
-  EXPECT_EQ(3U, SyncDataLocal(data).GetLocalAttachmentsForUpload().size());
 }
 
 TEST_F(SyncDataTest, CreateLocalDataWithAttachments_EmptyListOfAttachments) {
   specifics.mutable_preference();
-  AttachmentList attachments;
+  AttachmentIdList attachment_ids;
   SyncData data = SyncData::CreateLocalDataWithAttachments(
-      kSyncTag, kNonUniqueTitle, specifics, attachments);
+      kSyncTag, kNonUniqueTitle, specifics, attachment_ids);
   EXPECT_TRUE(data.IsValid());
   EXPECT_TRUE(data.IsLocal());
   EXPECT_EQ(kSyncTag, SyncDataLocal(data).GetTag());
@@ -102,7 +100,6 @@ TEST_F(SyncDataTest, CreateLocalDataWithAttachments_EmptyListOfAttachments) {
   EXPECT_EQ(kNonUniqueTitle, data.GetTitle());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
   EXPECT_TRUE(data.GetAttachmentIds().empty());
-  EXPECT_TRUE(SyncDataLocal(data).GetLocalAttachmentsForUpload().empty());
 }
 
 TEST_F(SyncDataTest, CreateRemoteData) {