[SyncFS] Replace callbacks with token in LocalToRemoteSyncer::UpdateRemoteMetadata

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 24 matching lines @@
 namespace {
 
 scoped_ptr<FileTracker> FindTrackerByID(MetadataDatabase* metadata_database,
                                         int64 tracker_id) {
   scoped_ptr<FileTracker> tracker(new FileTracker);
   if (metadata_database->FindTrackerByTrackerID(tracker_id, tracker.get()))
     return tracker.Pass();
   return scoped_ptr<FileTracker>();
 }
 
-void ReturnRetryOnSuccess(const SyncStatusCallback& callback,
-                          SyncStatusCode status) {
-  if (status == SYNC_STATUS_OK)
-    status = SYNC_STATUS_RETRY;
-  callback.Run(status);
-}
-
 bool IsLocalFileMissing(const SyncFileMetadata& local_metadata,
                         const FileChange& local_change) {
   return local_metadata.file_type == SYNC_FILE_TYPE_UNKNOWN ||
          local_change.IsDelete();
 }
 
 }  // namespace
 
 LocalToRemoteSyncer::LocalToRemoteSyncer(SyncEngineContext* sync_context,
                                          const SyncFileMetadata& local_metadata,
@@ skipping 373 matching lines @@
       error == google_apis::HTTP_CONFLICT ||
       error == google_apis::HTTP_NOT_FOUND) {
     // 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.
 
     needs_remote_change_listing_ = true;
     UpdateRemoteMetadata(
         remote_file_tracker_->file_id(),
-        base::Bind(&ReturnRetryOnSuccess,
-                   base::Bind(&LocalToRemoteSyncer::SyncCompleted,
-                              weak_ptr_factory_.GetWeakPtr(),
-                              base::Passed(&token))));
+        token.Pass());
     return;
   }
 
   SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK) {
     SyncCompleted(token.Pass(), status);
     return;
   }
 
   if (!entry) {
@@ skipping 40 matching lines @@
                    weak_ptr_factory_.GetWeakPtr(),
                    base::Passed(&token)));
     return;
   }
 
   SyncCompleted(token.Pass(), SYNC_STATUS_RETRY);
 }
 
 void LocalToRemoteSyncer::UpdateRemoteMetadata(
     const std::string& file_id,
-    const SyncStatusCallback& callback) {
+    scoped_ptr<SyncTaskToken> token) {
   DCHECK(remote_file_tracker_);
 
   drive_service()->GetFileResource(
       file_id,
       base::Bind(&LocalToRemoteSyncer::DidGetRemoteMetadata,
                  weak_ptr_factory_.GetWeakPtr(),
-                 file_id, callback));
+                 file_id, base::Passed(&token)));
 }
 
 void LocalToRemoteSyncer::DidGetRemoteMetadata(
     const std::string& file_id,
-    const SyncStatusCallback& callback,
+    scoped_ptr<SyncTaskToken> token,
     google_apis::GDataErrorCode error,
     scoped_ptr<google_apis::FileResource> entry) {
   DCHECK(sync_context_->GetWorkerTaskRunner()->RunsTasksOnCurrentThread());
 
   if (error == google_apis::HTTP_NOT_FOUND) {
-    metadata_database()->UpdateByDeletedRemoteFile(file_id, callback);
+    metadata_database()->UpdateByDeletedRemoteFile(
+        file_id,
+        base::Bind(&LocalToRemoteSyncer::CompleteWithRetryStatus,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   base::Passed(&token)));
     return;
   }
 
   SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK) {
-    callback.Run(status);
+    SyncCompleted(token.Pass(), status);
     return;
   }
 
   if (!entry) {
     NOTREACHED();
-    callback.Run(SYNC_STATUS_FAILED);
+    SyncCompleted(token.Pass(), SYNC_STATUS_FAILED);
     return;
   }
 
-  metadata_database()->UpdateByFileResource(*entry, callback);
+  metadata_database()->UpdateByFileResource(
+      *entry,
+      base::Bind(&LocalToRemoteSyncer::CompleteWithRetryStatus,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 base::Passed(&token)));
 }
 
 void LocalToRemoteSyncer::DidDeleteForUploadNewFile(
     scoped_ptr<SyncTaskToken> token,
     SyncStatusCode status) {
   if (status == SYNC_STATUS_HAS_CONFLICT) {
     UpdateRemoteMetadata(
         remote_file_tracker_->file_id(),
-        base::Bind(&ReturnRetryOnSuccess,
-                   base::Bind(&LocalToRemoteSyncer::SyncCompleted,
-                              weak_ptr_factory_.GetWeakPtr(),
-                              base::Passed(&token))));
+        token.Pass());
     return;
   }
 
   if (status != SYNC_STATUS_OK) {
     SyncCompleted(token.Pass(), status);
     return;
   }
 
   UploadNewFile(token.Pass());
 }
 
 void LocalToRemoteSyncer::DidDeleteForCreateFolder(
     scoped_ptr<SyncTaskToken> token,
     SyncStatusCode status) {
   if (status == SYNC_STATUS_HAS_CONFLICT) {
-    UpdateRemoteMetadata(
-        remote_file_tracker_->file_id(),
-        base::Bind(&ReturnRetryOnSuccess,
-                   base::Bind(&LocalToRemoteSyncer::SyncCompleted,
-                              weak_ptr_factory_.GetWeakPtr(),
-                              base::Passed(&token))));
+    UpdateRemoteMetadata(remote_file_tracker_->file_id(), token.Pass());
     return;
   }
 
   if (status != SYNC_STATUS_OK) {
     SyncCompleted(token.Pass(), status);
     return;
   }
 
   CreateRemoteFolder(token.Pass());
 }
@@ skipping 126 matching lines @@
 
 drive::DriveUploaderInterface* LocalToRemoteSyncer::drive_uploader() {
   set_used_network(true);
   return sync_context_->GetDriveUploader();
 }
 
 MetadataDatabase* LocalToRemoteSyncer::metadata_database() {
   return sync_context_->GetMetadataDatabase();
 }
 
+void LocalToRemoteSyncer::CompleteWithRetryStatus(
+    scoped_ptr<SyncTaskToken> token,
+    SyncStatusCode status) {
+  if (status == SYNC_STATUS_OK)
+    status = SYNC_STATUS_RETRY;
+  SyncCompleted(token.Pass(), status);
+}
+
 }  // namespace drive_backend
 }  // namespace sync_file_system