Convert sync_callbacks.h to OnceCallback

This CL converts SyncFileMetadataCallback and SyncFileStatusCallback to
OnceCallbacks.

It also deletes the unused SyncFileSetCallback.

Bug: 1152272
Change-Id: Ib85b776c602cdffb871f79ad158f0726c7ed9594
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2606603
Auto-Submit: Thomas Guilbert <tguilbert@chromium.org>
Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840953}

chrome/browser/sync_file_system/local/local_file_sync_context.cc

@@ -437,14 +437,14 @@ void LocalFileSyncContext::RecordFakeLocalChange(
 void LocalFileSyncContext::GetFileMetadata(
     FileSystemContext* file_system_context,
     const FileSystemURL& url,
-    const SyncFileMetadataCallback& callback) {
+    SyncFileMetadataCallback callback) {
   // This is initially called on UI thread and to be relayed to IO thread.
   if (!io_task_runner_->RunsTasksInCurrentSequence()) {
     DCHECK(ui_task_runner_->RunsTasksInCurrentSequence());
     io_task_runner_->PostTask(
-        FROM_HERE,
-        base::BindOnce(&LocalFileSyncContext::GetFileMetadata, this,
-                       base::RetainedRef(file_system_context), url, callback));
+        FROM_HERE, base::BindOnce(&LocalFileSyncContext::GetFileMetadata, this,
+                                  base::RetainedRef(file_system_context), url,
+                                  std::move(callback)));
     return;
   }
   DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
@@ -457,7 +457,7 @@ void LocalFileSyncContext::GetFileMetadata(
           FileSystemOperation::GET_METADATA_FIELD_SIZE |
           FileSystemOperation::GET_METADATA_FIELD_LAST_MODIFIED,
       base::BindOnce(&LocalFileSyncContext::DidGetFileMetadata, this,
-                     callback));
+                     std::move(callback)));
 }
 
 void LocalFileSyncContext::HasPendingLocalChanges(
@@ -1024,7 +1024,7 @@ void LocalFileSyncContext::DidApplyRemoteChange(
 }
 
 void LocalFileSyncContext::DidGetFileMetadata(
-    const SyncFileMetadataCallback& callback,
+    SyncFileMetadataCallback callback,
     base::File::Error file_error,
     const base::File::Info& file_info) {
   DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
@@ -1036,8 +1036,9 @@ void LocalFileSyncContext::DidGetFileMetadata(
     metadata.last_modified = file_info.last_modified;
   }
   ui_task_runner_->PostTask(
-      FROM_HERE, base::BindOnce(callback, FileErrorToSyncStatusCode(file_error),
-                                metadata));
+      FROM_HERE,
+      base::BindOnce(std::move(callback), FileErrorToSyncStatusCode(file_error),
+                     metadata));
 }
 
 base::TimeDelta LocalFileSyncContext::NotifyChangesDuration() {

chrome/browser/sync_file_system/local/local_file_sync_context.h

@@ -173,7 +173,7 @@ class LocalFileSyncContext
   // This must be called on UI thread.
   void GetFileMetadata(storage::FileSystemContext* file_system_context,
                        const storage::FileSystemURL& url,
-                       const SyncFileMetadataCallback& callback);
+                       SyncFileMetadataCallback callback);
 
   // Returns true via |callback| if the given file |url| has local pending
   // changes.
@@ -312,10 +312,9 @@ class LocalFileSyncContext
                             SyncStatusCallback callback_on_ui,
                             base::File::Error file_error);
 
-  void DidGetFileMetadata(
-      const SyncFileMetadataCallback& callback,
-      base::File::Error file_error,
-      const base::File::Info& file_info);
+  void DidGetFileMetadata(SyncFileMetadataCallback callback,
+                          base::File::Error file_error,
+                          const base::File::Info& file_info);
 
   base::TimeDelta NotifyChangesDuration();
 

chrome/browser/sync_file_system/local/local_file_sync_service.cc

@@ -215,10 +215,11 @@ void LocalFileSyncService::PromoteDemotedChanges(
 }
 
 void LocalFileSyncService::GetLocalFileMetadata(
-    const FileSystemURL& url, const SyncFileMetadataCallback& callback) {
+    const FileSystemURL& url,
+    SyncFileMetadataCallback callback) {
   DCHECK(base::Contains(origin_to_contexts_, url.origin().GetURL()));
   sync_context_->GetFileMetadata(origin_to_contexts_[url.origin().GetURL()],
-                                 url, callback);
+                                 url, std::move(callback));
 }
 
 void LocalFileSyncService::PrepareForProcessRemoteChange(

chrome/browser/sync_file_system/local/local_file_sync_service.h

@@ -129,7 +129,7 @@ class LocalFileSyncService
 
   // Returns the metadata of a remote file pointed by |url|.
   virtual void GetLocalFileMetadata(const storage::FileSystemURL& url,
-                                    const SyncFileMetadataCallback& callback);
+                                    SyncFileMetadataCallback callback);
 
   // RemoteChangeProcessor overrides.
   void PrepareForProcessRemoteChange(

chrome/browser/sync_file_system/sync_callbacks.h

@@ -24,17 +24,13 @@ using SyncFileCallback =
     base::OnceCallback<void(SyncStatusCode status,
                             const storage::FileSystemURL& url)>;
 
-typedef base::Callback<void(SyncStatusCode status,
-                            const SyncFileMetadata& metadata)>
-    SyncFileMetadataCallback;
-
-typedef base::Callback<
-    void(SyncStatusCode status, const storage::FileSystemURLSet& urls)>
-    SyncFileSetCallback;
+using SyncFileMetadataCallback =
+    base::OnceCallback<void(SyncStatusCode status,
+                            const SyncFileMetadata& metadata)>;
 
-typedef base::Callback<void(SyncStatusCode status,
-                            SyncFileStatus sync_file_status)>
-    SyncFileStatusCallback;
+using SyncFileStatusCallback =
+    base::OnceCallback<void(SyncStatusCode status,
+                            SyncFileStatus sync_file_status)>;
 
 }  // namespace sync_file_system
 

chrome/browser/sync_file_system/sync_file_system_service.cc

@@ -325,23 +325,23 @@ void SyncFileSystemService::DumpDatabase(const DumpFilesCallback& callback) {
                  AsWeakPtr(), callback));
 }
 
-void SyncFileSystemService::GetFileSyncStatus(
-    const FileSystemURL& url, const SyncFileStatusCallback& callback) {
+void SyncFileSystemService::GetFileSyncStatus(const FileSystemURL& url,
+                                              SyncFileStatusCallback callback) {
   DCHECK(local_service_);
   DCHECK(remote_service_);
 
   // It's possible to get an invalid FileEntry.
   if (!url.is_valid()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, SYNC_FILE_ERROR_INVALID_URL,
-                                  SYNC_FILE_STATUS_UNKNOWN));
+        FROM_HERE,
+        base::BindOnce(std::move(callback), SYNC_FILE_ERROR_INVALID_URL,
+                       SYNC_FILE_STATUS_UNKNOWN));
     return;
   }
 
   local_service_->HasPendingLocalChanges(
-      url,
-      base::Bind(&SyncFileSystemService::DidGetLocalChangeStatus,
-                 AsWeakPtr(), callback));
+      url, base::BindOnce(&SyncFileSystemService::DidGetLocalChangeStatus,
+                          AsWeakPtr(), std::move(callback)));
 }
 
 void SyncFileSystemService::AddSyncEventObserver(SyncEventObserver* observer) {
@@ -620,13 +620,12 @@ void SyncFileSystemService::SetSyncEnabledForTesting(bool enabled) {
 }
 
 void SyncFileSystemService::DidGetLocalChangeStatus(
-    const SyncFileStatusCallback& callback,
+    SyncFileStatusCallback callback,
     SyncStatusCode status,
     bool has_pending_local_changes) {
-  callback.Run(
-      status,
-      has_pending_local_changes ?
-          SYNC_FILE_STATUS_HAS_PENDING_CHANGES : SYNC_FILE_STATUS_SYNCED);
+  std::move(callback).Run(status, has_pending_local_changes
+                                      ? SYNC_FILE_STATUS_HAS_PENDING_CHANGES
+                                      : SYNC_FILE_STATUS_SYNCED);
 }
 
 void SyncFileSystemService::OnRemoteServiceStateUpdated(

chrome/browser/sync_file_system/sync_file_system_service.h

@@ -69,7 +69,7 @@ class SyncFileSystemService
 
   // Returns the file |url|'s sync status.
   void GetFileSyncStatus(const storage::FileSystemURL& url,
-                         const SyncFileStatusCallback& callback);
+                         SyncFileStatusCallback callback);
 
   void AddSyncEventObserver(SyncEventObserver* observer);
   void RemoveSyncEventObserver(SyncEventObserver* observer);
@@ -127,7 +127,7 @@ class SyncFileSystemService
   // Overrides sync_enabled_ setting. This should be called only by tests.
   void SetSyncEnabledForTesting(bool enabled);
 
-  void DidGetLocalChangeStatus(const SyncFileStatusCallback& callback,
+  void DidGetLocalChangeStatus(SyncFileStatusCallback callback,
                                SyncStatusCode status,
                                bool has_pending_local_changes);