Invoke AttachmentUploader and update AttachmentIds.

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 229 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::UpdateAttachmentId(

[maniscalco, 2014/05/09 18:12:11]

How about adding a unit test for this method?  directory_unittests.cc may be a
good place for it.

[pavely, 2014/05/13 23:06:44]

Done.

+    const sync_pb::AttachmentIdProto& attachment_id) {
+  DCHECK(kernel_);

[maniscalco, 2014/05/09 18:12:11]

Consider DCHECKing that attachment_id's unique_id is not empty string.

[pavely, 2014/05/13 23:06:44]

Done.

+  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() != attachment_id.unique_id())
+      continue;
+    record->set_is_on_server(true);

[maniscalco, 2014/05/09 18:12:11]

I wonder if we can make it more obvious that this method sets the is_on_server
flag?  In addition to updating the header comment, what do you think about
changing its name?

UpdateAttachmentIdOnServer?

UpdateAttachmentId(attachment_id, IS_ON_SERVER) ?

UpdateAttachmentIdAfterUpload(attachment_id) ?

[pavely, 2014/05/13 23:06:44]

Decided to name it UpdateAttachmentIdWithServerInfo.
On 2014/05/09 18:12:11, maniscalco wrote:

+    record->mutable_id()->set_url(attachment_id.url());
+  }
+  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