Update Commit and GetUpdatesResponse messages to include attachment ids.

sync/engine/commit_util.cc

 // Copyright 2013 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/engine/commit_util.h"
 
 #include <limits>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "sync/engine/syncer_proto_util.h"
+#include "sync/internal_api/public/base/attachment_id_proto.h"
 #include "sync/internal_api/public/base/unique_position.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/sync_session.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/entry.h"
 #include "sync/syncable/model_neutral_mutable_entry.h"
 #include "sync/syncable/syncable_base_transaction.h"
 #include "sync/syncable/syncable_base_write_transaction.h"
 #include "sync/syncable/syncable_changes_version.h"
@@ skipping 52 matching lines @@
     if (ProxyTypes().Has(it.Get()))
       continue;
     int field_number = GetSpecificsFieldNumberFromModelType(it.Get());
     config_params->mutable_enabled_type_ids()->Add(field_number);
   }
   config_params->set_tabs_datatype_enabled(
       enabled_types.Has(syncer::PROXY_TABS));
 }
 
 namespace {
+
 void SetEntrySpecifics(const Entry& meta_entry,
                        sync_pb::SyncEntity* sync_entry) {
   // Add the new style extension and the folder bit.
   sync_entry->mutable_specifics()->CopyFrom(meta_entry.GetSpecifics());
   sync_entry->set_folder(meta_entry.GetIsDir());
 
   CHECK(!sync_entry->specifics().password().has_client_only_encrypted_data());
   DCHECK_EQ(meta_entry.GetModelType(), GetModelType(*sync_entry));
 }
+
+void SetAttachmentIds(const Entry& meta_entry,
+                      sync_pb::SyncEntity* sync_entry) {
+  const sync_pb::AttachmentMetadata& attachment_metadata =
+      meta_entry.GetAttachmentMetadata();
+  for (int i = 0; i < attachment_metadata.record_size(); ++i) {
+    *sync_entry->add_attachment_id() = attachment_metadata.record(i).id();
+  }
+}
+
 }  // namespace
 
 void BuildCommitItem(
     const syncable::Entry& meta_entry,
     sync_pb::SyncEntity* sync_entry) {
   syncable::Id id = meta_entry.GetId();
   sync_entry->set_id_string(SyncableIdToProto(id));
 
   string name = meta_entry.GetNonUniqueName();
   CHECK(!name.empty());  // Make sure this isn't an update.
@@ skipping 49 matching lines @@
 
     // Version 0 means to create or undelete an object.
     sync_entry->set_version(0);
   } else {
     DCHECK(id.ServerKnows()) << meta_entry;
     sync_entry->set_version(meta_entry.GetBaseVersion());
   }
   sync_entry->set_ctime(TimeToProtoTime(meta_entry.GetCtime()));
   sync_entry->set_mtime(TimeToProtoTime(meta_entry.GetMtime()));
 
+  SetAttachmentIds(meta_entry, sync_entry);
+
   // Handle bookmarks separately.
   if (meta_entry.GetSpecifics().has_bookmark()) {
     if (meta_entry.GetIsDel()) {
       sync_entry->set_deleted(true);
     } else {
       // Both insert_after_item_id and position_in_parent fields are set only
       // for legacy reasons.  See comments in sync.proto for more information.
       const Id& prev_id = meta_entry.GetPredecessorId();
       string prev_id_string =
           prev_id.IsRoot() ? string() : prev_id.GetServerId();
@@ skipping 124 matching lines @@
   local_entry->PutServerIsDel(committed_entry.deleted());
   if (committed_entry.deleted()) {
     // Don't clobber any other fields of deleted objects.
     return;
   }
 
   local_entry->PutServerIsDir(
       (committed_entry.folder() ||
        committed_entry.bookmarkdata().bookmark_folder()));
   local_entry->PutServerSpecifics(committed_entry.specifics());
+  local_entry->PutServerAttachmentMetadata(
+      CreateAttachmentMetadata(committed_entry.attachment_id()));
   local_entry->PutServerMtime(ProtoTimeToTime(committed_entry.mtime()));
   local_entry->PutServerCtime(ProtoTimeToTime(committed_entry.ctime()));
   if (committed_entry.has_unique_position()) {
     local_entry->PutServerUniquePosition(
                      UniquePosition::FromProto(
                          committed_entry.unique_position()));
   }
 
   // TODO(nick): The server doesn't set entry_response.server_parent_id in
   // practice; to update SERVER_PARENT_ID appropriately here we'd need to
@@ skipping 128 matching lines @@
   }
 
   ProcessSuccessfulCommitResponse(commit_request_entry, server_entry,
       local_entry.GetId(), &local_entry, syncing_was_set, deleted_folders);
   return response;
 }
 
 }  // namespace commit_util
 
 }  // namespace syncer