Update Commit and GetUpdatesResponse messages to include attachment ids.

Private function HasAttachmentNotOnServer is now tested (albeit
indirectly) by directory_commit_contribution_unittest.cc via
DirectoryCommitContribution::Build.

When displayed in about:sync, SyncEntity instances will now show any
attachment ids they contain.

This CL depends on issue 395913003.

BUG=356266,394023

Review URL: https://codereview.chromium.org/393083004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283908 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 43 insertions, 0 deletions

diff --git a/sync/internal_api/test/test_entry_factory.cc b/sync/internal_api/test/test_entry_factory.cc
index ad0fa64..d2e6b73 100644
--- a/sync/internal_api/test/test_entry_factory.cc
+++ b/sync/internal_api/test/test_entry_factory.cc
@@ -239,6 +239,49 @@ const sync_pb::EntitySpecifics& TestEntryFactory::GetLocalSpecificsForItem(
   return entry.GetSpecifics();
 }
 
+bool TestEntryFactory::SetServerAttachmentMetadataForItem(
+    int64 meta_handle,
+    const sync_pb::AttachmentMetadata metadata) {
+  WriteTransaction trans(FROM_HERE, UNITTEST, directory_);
+  MutableEntry entry(&trans, syncable::GET_BY_HANDLE, meta_handle);
+  if (!entry.good()) {
+    return false;
+  }
+  entry.PutServerAttachmentMetadata(metadata);
+  entry.PutIsUnappliedUpdate(true);
+  return true;
+
+}
+
+bool TestEntryFactory::SetLocalAttachmentMetadataForItem(
+    int64 meta_handle,
+    const sync_pb::AttachmentMetadata metadata) {
+  WriteTransaction trans(FROM_HERE, UNITTEST, directory_);
+  MutableEntry entry(&trans, syncable::GET_BY_HANDLE, meta_handle);
+  if (!entry.good()) {
+    return false;
+  }
+  entry.PutAttachmentMetadata(metadata);
+  entry.PutIsUnsynced(true);
+  return true;
+}
+
+const sync_pb::AttachmentMetadata&
+TestEntryFactory::GetServerAttachmentMetadataForItem(int64 meta_handle) const {
+  syncable::ReadTransaction trans(FROM_HERE, directory_);
+  syncable::Entry entry(&trans, syncable::GET_BY_HANDLE, meta_handle);
+  DCHECK(entry.good());
+  return entry.GetServerAttachmentMetadata();
+}
+
+const sync_pb::AttachmentMetadata&
+TestEntryFactory::GetLocalAttachmentMetadataForItem(int64 meta_handle) const {
+  syncable::ReadTransaction trans(FROM_HERE, directory_);
+  syncable::Entry entry(&trans, syncable::GET_BY_HANDLE, meta_handle);
+  DCHECK(entry.good());
+  return entry.GetAttachmentMetadata();
+}
+
 bool TestEntryFactory::GetIsUnsyncedForItem(int64 meta_handle) const {
   syncable::ReadTransaction trans(FROM_HERE, directory_);
   syncable::Entry entry(&trans, syncable::GET_BY_HANDLE, meta_handle);