| Index: sync/syncable/directory_unittest.cc
|
| diff --git a/sync/syncable/directory_unittest.cc b/sync/syncable/directory_unittest.cc
|
| index 5f8cbed23c2225e3827f09a905586f6f8e4eaa5a..fecfaca2321cc9d684e67ed34813f93332617d7b 100644
|
| --- a/sync/syncable/directory_unittest.cc
|
| +++ b/sync/syncable/directory_unittest.cc
|
| @@ -1784,21 +1784,21 @@ TEST_F(SyncableDirectoryTest, Directory_GetAttachmentIdsToUpload) {
|
| PREFERENCES, "some other entry", id2, attachment_metadata);
|
|
|
| // See that Directory reports that this attachment is not on the server.
|
| - AttachmentIdSet id_set;
|
| + AttachmentIdList ids;
|
| {
|
| ReadTransaction trans(FROM_HERE, dir().get());
|
| - dir()->GetAttachmentIdsToUpload(&trans, PREFERENCES, &id_set);
|
| + dir()->GetAttachmentIdsToUpload(&trans, PREFERENCES, &ids);
|
| }
|
| - ASSERT_EQ(1U, id_set.size());
|
| - ASSERT_EQ(attachment_id, *id_set.begin());
|
| + ASSERT_EQ(1U, ids.size());
|
| + ASSERT_EQ(attachment_id, *ids.begin());
|
|
|
| // Call again, but this time with a ModelType for which there are no entries.
|
| // See that Directory correctly reports that there are none.
|
| {
|
| ReadTransaction trans(FROM_HERE, dir().get());
|
| - dir()->GetAttachmentIdsToUpload(&trans, PASSWORDS, &id_set);
|
| + dir()->GetAttachmentIdsToUpload(&trans, PASSWORDS, &ids);
|
| }
|
| - ASSERT_TRUE(id_set.empty());
|
| + ASSERT_TRUE(ids.empty());
|
|
|
| // Now, mark the attachment as "on the server" via entry_1.
|
| {
|
| @@ -1811,9 +1811,9 @@ TEST_F(SyncableDirectoryTest, Directory_GetAttachmentIdsToUpload) {
|
| // server.
|
| {
|
| ReadTransaction trans(FROM_HERE, dir().get());
|
| - dir()->GetAttachmentIdsToUpload(&trans, PREFERENCES, &id_set);
|
| + dir()->GetAttachmentIdsToUpload(&trans, PREFERENCES, &ids);
|
| }
|
| - ASSERT_TRUE(id_set.empty());
|
| + ASSERT_TRUE(ids.empty());
|
| }
|
|
|
| // Verify that the directory accepts entries with unset parent ID.
|
|
|