Update Commit and GetUpdatesResponse messages to include attachment ids.

sync/engine/syncer_util.cc

 // Copyright 2012 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/syncer_util.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/location.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "sync/engine/conflict_resolver.h"
 #include "sync/engine/syncer_proto_util.h"
 #include "sync/engine/syncer_types.h"
+#include "sync/internal_api/public/base/attachment_id_proto.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base/unique_position.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/entry.h"
 #include "sync/syncable/model_neutral_mutable_entry.h"
 #include "sync/syncable/mutable_entry.h"
 #include "sync/syncable/syncable_changes_version.h"
@@ skipping 370 matching lines @@
         << "Storing unrecognized datatype in sync database.";
     target->PutServerSpecifics(update.specifics());
   } else if (update.has_bookmarkdata()) {
     // Legacy protocol response for bookmark data.
     const sync_pb::SyncEntity::BookmarkData& bookmark = update.bookmarkdata();
     UpdateBookmarkSpecifics(update.server_defined_unique_tag(),
                             bookmark.bookmark_url(),
                             bookmark.bookmark_favicon(),
                             target);
   }
+  target->PutServerAttachmentMetadata(
+      CreateAttachmentMetadata(update.attachment_id()));
   if (SyncerProtoUtil::ShouldMaintainPosition(update)) {
     UpdateBookmarkPositioning(update, target);
   }
 
   target->PutServerIsDel(update.deleted());
   // We only mark the entry as unapplied if its version is greater than the
   // local data. If we're processing the update that corresponds to one of our
   // commit we don't apply it as time differences may occur.
   if (update.version() > target->GetBaseVersion()) {
     target->PutIsUnappliedUpdate(true);
@@ skipping 36 matching lines @@
     entry->PutParentId(entry->GetServerParentId());
     entry->PutUniquePosition(entry->GetServerUniquePosition());
     entry->PutIsDel(false);
   }
 
   entry->PutCtime(entry->GetServerCtime());
   entry->PutMtime(entry->GetServerMtime());
   entry->PutBaseVersion(entry->GetServerVersion());
   entry->PutIsDel(entry->GetServerIsDel());
   entry->PutIsUnappliedUpdate(false);
+  entry->PutAttachmentMetadata(entry->GetServerAttachmentMetadata());
 }
 
 VerifyCommitResult ValidateCommitEntry(syncable::Entry* entry) {
   syncable::Id id = entry->GetId();
   if (id == entry->GetParentId()) {
     CHECK(id.IsRoot()) << "Non-root item is self parenting." << *entry;
     // If the root becomes unsynced it can cause us problems.
     LOG(ERROR) << "Root item became unsynced " << *entry;
     return VERIFY_UNSYNCABLE;
   }
@@ skipping 165 matching lines @@
   if (update.version() < target->GetServerVersion()) {
     LOG(WARNING) << "Update older than current server version for "
                  << *target << " Update:"
                  << SyncerProtoUtil::SyncEntityDebugString(update);
     return VERIFY_SUCCESS;  // Expected in new sync protocol.
   }
   return VERIFY_UNDECIDED;
 }
 
 }  // namespace syncer