| Index: components/sync/syncable/directory_unittest.cc
|
| diff --git a/components/sync/syncable/directory_unittest.cc b/components/sync/syncable/directory_unittest.cc
|
| index fe8f3e8b8c6d242b002ea4035edd568b1031a885..5c6198784f43b84284bce5995e6692dccad9c44d 100644
|
| --- a/components/sync/syncable/directory_unittest.cc
|
| +++ b/components/sync/syncable/directory_unittest.cc
|
| @@ -1711,7 +1711,7 @@ TEST_F(SyncableDirectoryTest, MutableEntry_PutAttachmentMetadata) {
|
| sync_pb::AttachmentMetadata attachment_metadata;
|
| sync_pb::AttachmentMetadataRecord* record = attachment_metadata.add_record();
|
| sync_pb::AttachmentIdProto attachment_id_proto =
|
| - syncer::CreateAttachmentIdProto(0, 0);
|
| + CreateAttachmentIdProto(0, 0);
|
| *record->mutable_id() = attachment_id_proto;
|
| ASSERT_FALSE(dir()->IsAttachmentLinked(attachment_id_proto));
|
| {
|
| @@ -1755,8 +1755,8 @@ TEST_F(SyncableDirectoryTest, MutableEntry_UpdateAttachmentId) {
|
| sync_pb::AttachmentMetadata attachment_metadata;
|
| sync_pb::AttachmentMetadataRecord* r1 = attachment_metadata.add_record();
|
| sync_pb::AttachmentMetadataRecord* r2 = attachment_metadata.add_record();
|
| - *r1->mutable_id() = syncer::CreateAttachmentIdProto(0, 0);
|
| - *r2->mutable_id() = syncer::CreateAttachmentIdProto(0, 0);
|
| + *r1->mutable_id() = CreateAttachmentIdProto(0, 0);
|
| + *r2->mutable_id() = CreateAttachmentIdProto(0, 0);
|
| sync_pb::AttachmentIdProto attachment_id_proto = r1->id();
|
|
|
| WriteTransaction trans(FROM_HERE, UNITTEST, dir().get());
|
| @@ -1794,7 +1794,7 @@ TEST_F(SyncableDirectoryTest, Directory_DeleteDoesNotUnlinkAttachments) {
|
| sync_pb::AttachmentMetadata attachment_metadata;
|
| sync_pb::AttachmentMetadataRecord* record = attachment_metadata.add_record();
|
| sync_pb::AttachmentIdProto attachment_id_proto =
|
| - syncer::CreateAttachmentIdProto(0, 0);
|
| + CreateAttachmentIdProto(0, 0);
|
| *record->mutable_id() = attachment_id_proto;
|
| ASSERT_FALSE(dir()->IsAttachmentLinked(attachment_id_proto));
|
| const Id id = TestIdFactory::FromNumber(-1);
|
| @@ -1823,7 +1823,7 @@ TEST_F(SyncableDirectoryTest, Directory_LastReferenceUnlinksAttachments) {
|
| sync_pb::AttachmentMetadata attachment_metadata;
|
| sync_pb::AttachmentMetadataRecord* record = attachment_metadata.add_record();
|
| sync_pb::AttachmentIdProto attachment_id_proto =
|
| - syncer::CreateAttachmentIdProto(0, 0);
|
| + CreateAttachmentIdProto(0, 0);
|
| *record->mutable_id() = attachment_id_proto;
|
|
|
| // Create two entries, each referencing the attachment.
|
|
|