Pass AttachmentIdList instead of AttachmentList to SyncData

sync/api/sync_data_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/api/sync_data.h"
 
 #include <string>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 53 matching lines @@
   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());
 }
 
 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());
   EXPECT_EQ(kDatatype, data.GetDataType());
   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) {
   specifics.mutable_preference();
   SyncData data = SyncData::CreateRemoteData(kId,
                                              specifics,
                                              kLastModifiedTime,
                                              AttachmentIdList(),
                                              attachment_service_proxy);
   EXPECT_TRUE(data.IsValid());
   EXPECT_FALSE(data.IsLocal());
   EXPECT_EQ(kId, SyncDataRemote(data).GetId());
   EXPECT_EQ(kLastModifiedTime, SyncDataRemote(data).GetModifiedTime());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
   EXPECT_TRUE(data.GetAttachmentIds().empty());
 }
 
 // TODO(maniscalco): Add test cases that verify GetLocalAttachmentsForUpload and
 // DropAttachments calls are passed through to the underlying AttachmentService.
 
 }  // namespace
 
 }  // namespace syncer