[SyncFS] Update tracker on upload

chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.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 "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 364 matching lines @@
       base::Bind(&LocalToRemoteSyncer::DidUploadExistingFile,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback),
       google_apis::ProgressCallback());
 }
 
 void LocalToRemoteSyncer::DidUploadExistingFile(
     const SyncStatusCallback& callback,
     google_apis::GDataErrorCode error,
     const GURL&,
-    scoped_ptr<google_apis::ResourceEntry>) {
+    scoped_ptr<google_apis::ResourceEntry> entry) {
   if (error == google_apis::HTTP_PRECONDITION) {
     // The remote file has unfetched remote change.  Fetch latest metadata and
     // update database with it.
     // TODO(tzik): Consider adding local side low-priority dirtiness handling to
     // handle this as ListChangesTask.
     UpdateRemoteMetadata(callback);
     return;
   }
 
-  callback.Run(GDataErrorCodeToSyncStatusCode(error));
+  metadata_database()->UpdateByFileResource(
+      *drive::util::ConvertResourceEntryToFileResource(*entry),
+      base::Bind(&LocalToRemoteSyncer::DidUpdateMetadataForUpload,

[kinuko, 2013/12/02 09:05:39]

We have DidUpdateDatabaseForUpload for UploadNewFile case, can we name these
better?

[tzik, 2013/12/02 15:30:50]

Renamed.
Do DidUpdateDatabaseForUpload{NewFile,ExistingFile} work?

+                 weak_ptr_factory_.GetWeakPtr(),
+                 callback));
+}
+
+void LocalToRemoteSyncer::DidUpdateMetadataForUpload(
+    const SyncStatusCallback& callback,
+    SyncStatusCode status) {
+  if (status != SYNC_STATUS_OK) {
+    callback.Run(status);
+    return;
+  }
+
+  FileMetadata file;
+  bool should_success = metadata_database()->FindFileByFileID(
+      remote_file_tracker_->file_id(), &file);
+  if (should_success) {
+    NOTREACHED();

[kinuko, 2013/12/02 09:40:30]

Hmm, I hit here in my local testing.

[tzik, 2013/12/02 15:30:50]

...
That's broken, reversed.
Fixed! Thanks!

+    callback.Run(SYNC_STATUS_FAILED);
+    return;
+  }
+
+  metadata_database()->UpdateTracker(
+      remote_file_tracker_->tracker_id(),
+      file.details(),
+      callback);
 }
 
 void LocalToRemoteSyncer::UpdateRemoteMetadata(
     const SyncStatusCallback& callback) {
   DCHECK(remote_file_tracker_);
   drive_service()->GetResourceEntry(
       remote_file_tracker_->file_id(),
       base::Bind(&LocalToRemoteSyncer::DidGetRemoteMetadata,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
@@ skipping 194 matching lines @@
   set_used_network(true);
   return sync_context_->GetDriveUploader();
 }
 
 MetadataDatabase* LocalToRemoteSyncer::metadata_database() {
   return sync_context_->GetMetadataDatabase();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system