Do not update AttachmentIds after uploading attachments to sync server.

sync/syncable/mutable_entry.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/syncable/mutable_entry.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "sync/internal_api/public/base/unique_position.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/scoped_kernel_lock.h"
@@ skipping 228 matching lines @@
   if (kernel_->ref(ATTACHMENT_METADATA).SerializeAsString() !=
       attachment_metadata.SerializeAsString()) {
     dir()->UpdateAttachmentIndex(GetMetahandle(),
                                  kernel_->ref(ATTACHMENT_METADATA),
                                  attachment_metadata);
     kernel_->put(ATTACHMENT_METADATA, attachment_metadata);
     kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
   }
 }
 
-void MutableEntry::UpdateAttachmentIdWithServerInfo(
-    const sync_pb::AttachmentIdProto& updated_attachment_id) {
+void MutableEntry::MarkAttachmentAsOnServer(
+    const sync_pb::AttachmentIdProto& attachment_id) {
   DCHECK(kernel_);
-  DCHECK(!updated_attachment_id.unique_id().empty());
+  DCHECK(!attachment_id.unique_id().empty());
   write_transaction()->TrackChangesTo(kernel_);
   sync_pb::AttachmentMetadata& attachment_metadata =
       kernel_->mutable_ref(ATTACHMENT_METADATA);
   for (int i = 0; i < attachment_metadata.record_size(); ++i) {
     sync_pb::AttachmentMetadataRecord* record =
         attachment_metadata.mutable_record(i);
-    if (record->id().unique_id() != updated_attachment_id.unique_id())
+    if (record->id().unique_id() != attachment_id.unique_id())
       continue;
-    *record->mutable_id() = updated_attachment_id;
     record->set_is_on_server(true);
   }
   kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
   MarkForSyncing(this);
 }
 
 // This function sets only the flags needed to get this entry to sync.
 bool MarkForSyncing(MutableEntry* e) {
   DCHECK_NE(static_cast<MutableEntry*>(NULL), e);
   DCHECK(!e->IsRoot()) << "We shouldn't mark a permanent object for syncing.";
   if (!(e->PutIsUnsynced(true)))
     return false;
   e->PutSyncing(false);
   return true;
 }
 
 }  // namespace syncable
 }  // namespace syncer