Convert c/b/ui/webui/sync_file_system_internals/ from base::Bind to Once/Repeating

Bug: 1152282
Change-Id: Ic60eb67049d49e55f07314d1728a50b54d99115e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2601221Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839033}

chrome/browser/sync_file_system/sync_file_system_service.cc

@@ -299,10 +299,10 @@ void SyncFileSystemService::InitializeForApp(
 }
 
 void SyncFileSystemService::GetExtensionStatusMap(
-    const ExtensionStatusMapCallback& callback) {
-  remote_service_->GetOriginStatusMap(
-      base::Bind(&SyncFileSystemService::DidGetExtensionStatusMap,
-                 AsWeakPtr(), callback));
+    ExtensionStatusMapCallback callback) {
+  remote_service_->GetOriginStatusMap(base::AdaptCallbackForRepeating(
+      base::BindOnce(&SyncFileSystemService::DidGetExtensionStatusMap,
+                     AsWeakPtr(), std::move(callback))));
 }
 
 void SyncFileSystemService::DumpFiles(const GURL& origin,
@@ -607,11 +607,11 @@ void SyncFileSystemService::DidDumpDatabase(
 }
 
 void SyncFileSystemService::DidGetExtensionStatusMap(
-    const ExtensionStatusMapCallback& callback,
+    ExtensionStatusMapCallback callback,
     std::unique_ptr<RemoteFileSyncService::OriginStatusMap> status_map) {
   if (!status_map)
     status_map = base::WrapUnique(new RemoteFileSyncService::OriginStatusMap);
-  callback.Run(*status_map);
+  std::move(callback).Run(*status_map);
 }
 
 void SyncFileSystemService::SetSyncEnabledForTesting(bool enabled) {

chrome/browser/sync_file_system/sync_file_system_service.h

@@ -52,7 +52,8 @@ class SyncFileSystemService
       public base::SupportsWeakPtr<SyncFileSystemService> {
  public:
   typedef base::Callback<void(const base::ListValue&)> DumpFilesCallback;
-  typedef base::Callback<void(const RemoteFileSyncService::OriginStatusMap&)>
+  typedef base::OnceCallback<void(
+      const RemoteFileSyncService::OriginStatusMap&)>
       ExtensionStatusMapCallback;
 
   // KeyedService implementation.
@@ -62,7 +63,7 @@ class SyncFileSystemService
                         const GURL& app_origin,
                         SyncStatusCallback callback);
 
-  void GetExtensionStatusMap(const ExtensionStatusMapCallback& callback);
+  void GetExtensionStatusMap(ExtensionStatusMapCallback callback);
   void DumpFiles(const GURL& origin, const DumpFilesCallback& callback);
   void DumpDatabase(const DumpFilesCallback& callback);
 
@@ -120,7 +121,7 @@ class SyncFileSystemService
                        std::unique_ptr<base::ListValue> list);
 
   void DidGetExtensionStatusMap(
-      const ExtensionStatusMapCallback& callback,
+      ExtensionStatusMapCallback callback,
       std::unique_ptr<RemoteFileSyncService::OriginStatusMap> status_map);
 
   // Overrides sync_enabled_ setting. This should be called only by tests.

chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.cc

@@ -31,9 +31,9 @@ void DumpDatabaseHandler::HandleGetDatabaseDump(const base::ListValue* args) {
   sync_file_system::SyncFileSystemService* sync_service =
       SyncFileSystemServiceFactory::GetForProfile(profile_);
   if (sync_service) {
-    sync_service->DumpDatabase(base::Bind(
+    sync_service->DumpDatabase(base::AdaptCallbackForRepeating(base::BindOnce(
         &DumpDatabaseHandler::DidGetDatabaseDump, base::Unretained(this),
-        args->GetList()[0].GetString() /* callback_id */));
+        args->GetList()[0].GetString() /* callback_id */)));
   }
 }
 

chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc

@@ -35,10 +35,10 @@ namespace {
 // ExtensionStatusesHandler and FileMetadataHandler.
 void ConvertExtensionStatusToDictionary(
     const base::WeakPtr<extensions::ExtensionService>& extension_service,
-    const base::Callback<void(const base::ListValue&)>& callback,
+    base::OnceCallback<void(const base::ListValue&)> callback,
     const std::map<GURL, std::string>& status_map) {
   if (!extension_service) {
-    callback.Run(base::ListValue());
+    std::move(callback).Run(base::ListValue());
     return;
   }
 
@@ -63,7 +63,7 @@ void ConvertExtensionStatusToDictionary(
     list.Append(std::move(dict));
   }
 
-  callback.Run(list);
+  std::move(callback).Run(list);
 }
 
 }  // namespace
@@ -83,26 +83,26 @@ void ExtensionStatusesHandler::RegisterMessages() {
 // static
 void ExtensionStatusesHandler::GetExtensionStatusesAsDictionary(
     Profile* profile,
-    const base::Callback<void(const base::ListValue&)>& callback) {
+    base::OnceCallback<void(const base::ListValue&)> callback) {
   DCHECK(profile);
 
   sync_file_system::SyncFileSystemService* sync_service =
       SyncFileSystemServiceFactory::GetForProfile(profile);
   if (!sync_service) {
-    callback.Run(base::ListValue());
+    std::move(callback).Run(base::ListValue());
     return;
   }
 
   extensions::ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   if (!extension_service) {
-    callback.Run(base::ListValue());
+    std::move(callback).Run(base::ListValue());
     return;
   }
 
-  sync_service->GetExtensionStatusMap(base::Bind(
-      &ConvertExtensionStatusToDictionary,
-      extension_service->AsWeakPtr(), callback));
+  sync_service->GetExtensionStatusMap(
+      base::BindOnce(&ConvertExtensionStatusToDictionary,
+                     extension_service->AsWeakPtr(), std::move(callback)));
 }
 
 void ExtensionStatusesHandler::HandleGetExtensionStatuses(
@@ -110,9 +110,10 @@ void ExtensionStatusesHandler::HandleGetExtensionStatuses(
   AllowJavascript();
   DCHECK(args);
   GetExtensionStatusesAsDictionary(
-      profile_, base::Bind(&ExtensionStatusesHandler::DidGetExtensionStatuses,
-                           weak_ptr_factory_.GetWeakPtr(),
-                           args->GetList()[0].GetString() /* callback_id */));
+      profile_,
+      base::BindOnce(&ExtensionStatusesHandler::DidGetExtensionStatuses,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     args->GetList()[0].GetString() /* callback_id */));
 }
 
 void ExtensionStatusesHandler::DidGetExtensionStatuses(

chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h

@@ -27,7 +27,7 @@ class ExtensionStatusesHandler : public content::WebUIMessageHandler {
   // extension drop down.
   static void GetExtensionStatusesAsDictionary(
       Profile* profile,
-      const base::Callback<void(const base::ListValue&)>& callback);
+      base::OnceCallback<void(const base::ListValue&)> callback);
 
   // WebUIMessageHandler implementation.
   void RegisterMessages() override;

chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc

@@ -60,18 +60,20 @@ void FileMetadataHandler::HandleGetFileMetadata(const base::ListValue* args) {
       SyncFileSystemServiceFactory::GetForProfile(profile_);
   if (!sync_service)
     return;
-  sync_service->DumpFiles(origin,
-                          base::Bind(&FileMetadataHandler::DidGetFileMetadata,
-                                     weak_factory_.GetWeakPtr(), callback_id));
+  sync_service->DumpFiles(
+      origin, base::AdaptCallbackForRepeating(
+                  base::BindOnce(&FileMetadataHandler::DidGetFileMetadata,
+                                 weak_factory_.GetWeakPtr(), callback_id)));
 }
 
 void FileMetadataHandler::HandleGetExtensions(const base::ListValue* args) {
   AllowJavascript();
   DCHECK(args);
   ExtensionStatusesHandler::GetExtensionStatusesAsDictionary(
-      profile_, base::Bind(&FileMetadataHandler::DidGetExtensions,
-                           weak_factory_.GetWeakPtr(),
-                           args->GetList()[0].GetString() /* callback_id */));
+      profile_,
+      base::BindOnce(&FileMetadataHandler::DidGetExtensions,
+                     weak_factory_.GetWeakPtr(),
+                     args->GetList()[0].GetString() /* callback_id */));
 }
 
 void FileMetadataHandler::DidGetExtensions(std::string callback_id,