Convert AppDataMigrator to use OnceClosure

This is just in preparation for future changes to how this class uses
IndexedDB.

Change-Id: Ic10969e970f90a62db064c2fa53a388ff63658e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2020564
Auto-Submit: enne <enne@chromium.org>
Reviewed-by: Ben Wells <benwells@chromium.org>
Commit-Queue: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735134}

chrome/browser/extensions/app_data_migrator.cc

@@ -82,7 +82,7 @@ void MigrateFileSystem(WeakPtr<extensions::AppDataMigrator> migrator,
                        StoragePartition* old_partition,
                        StoragePartition* current_partition,
                        const extensions::Extension* extension,
-                       const base::Closure& reply) {
+                       base::OnceClosure reply) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Since this method is static and it's being run as a closure task, check to
@@ -103,14 +103,14 @@ void MigrateFileSystem(WeakPtr<extensions::AppDataMigrator> migrator,
       base::BindOnce(
           &MigrateOnFileSystemThread, base::RetainedRef(old_fs_context),
           base::RetainedRef(fs_context), base::RetainedRef(extension)),
-      reply);
+      std::move(reply));
 }
 
 void MigrateLegacyPartition(WeakPtr<extensions::AppDataMigrator> migrator,
                             StoragePartition* old_partition,
                             StoragePartition* current_partition,
                             const extensions::Extension* extension,
-                            const base::Closure& reply) {
+                            base::OnceClosure reply) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   IndexedDBContext* indexed_db_context =
@@ -120,9 +120,9 @@ void MigrateLegacyPartition(WeakPtr<extensions::AppDataMigrator> migrator,
 
   // Create a closure for the file system migration. This is the next step in
   // the migration flow after the IndexedDB migration.
-  base::Closure migrate_fs =
-      base::Bind(&MigrateFileSystem, migrator, old_partition, current_partition,
-                 base::RetainedRef(extension), reply);
+  base::OnceClosure migrate_fs = base::BindOnce(
+      &MigrateFileSystem, migrator, old_partition, current_partition,
+      base::RetainedRef(extension), std::move(reply));
 
   // Perform the IndexedDB migration on the old context's sequenced task
   // runner. After completion, it should call MigrateFileSystem.
@@ -131,7 +131,7 @@ void MigrateLegacyPartition(WeakPtr<extensions::AppDataMigrator> migrator,
       base::BindOnce(
           &MigrateOnIndexedDBThread, base::RetainedRef(old_indexed_db_context),
           base::RetainedRef(indexed_db_context), base::RetainedRef(extension)),
-      migrate_fs);
+      std::move(migrate_fs));
 }
 
 }  // namespace
@@ -151,7 +151,7 @@ bool AppDataMigrator::NeedsMigration(const Extension* old,
 
 void AppDataMigrator::DoMigrationAndReply(const Extension* old,
                                           const Extension* extension,
-                                          const base::Closure& reply) {
+                                          base::OnceClosure reply) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(NeedsMigration(old, extension));
 
@@ -174,7 +174,7 @@ void AppDataMigrator::DoMigrationAndReply(const Extension* old,
     registry_->AddEnabled(old);
 
   MigrateLegacyPartition(weak_factory_.GetWeakPtr(), old_partition,
-                         new_partition, extension, reply);
+                         new_partition, extension, std::move(reply));
 }
 
 }  // namespace extensions

chrome/browser/extensions/app_data_migrator.h

@@ -27,7 +27,7 @@ class AppDataMigrator {
 
   void DoMigrationAndReply(const Extension* old,
                            const Extension* extension,
-                           const base::Closure& reply);
+                           base::OnceClosure reply);
 
  private:
   Profile* profile_;

chrome/browser/extensions/app_data_migrator_unittest.cc

@@ -115,9 +115,6 @@ scoped_refptr<const Extension> GetTestExtension(bool platform_app) {
   return app;
 }
 
-void MigrationCallback() {
-}
-
 void DidWrite(base::File::Error status, int64_t bytes, bool complete) {
   base::RunLoop::QuitCurrentWhenIdleDeprecated();
 }
@@ -252,7 +249,7 @@ TEST_F(AppDataMigratorTest, NoOpMigration) {
 
   // Nothing to migrate. Basically this should just not cause an error
   migrator_->DoMigrationAndReply(old_ext.get(), new_ext.get(),
-                                 base::Bind(&MigrationCallback));
+                                 base::DoNothing());
 }
 
 // crbug.com/747589
@@ -264,7 +261,7 @@ TEST_F(AppDataMigratorTest, DISABLED_FileSystemMigration) {
                     default_fs_context_, profile_.get());
 
   migrator_->DoMigrationAndReply(old_ext.get(), new_ext.get(),
-                                 base::Bind(&MigrationCallback));
+                                 base::DoNothing());
 
   content::RunAllTasksUntilIdle();
 

chrome/browser/extensions/extension_service.cc

@@ -1600,8 +1600,9 @@ void ExtensionService::AddNewOrUpdatedExtension(
   const Extension* old = registry_->GetInstalledExtension(extension->id());
   if (AppDataMigrator::NeedsMigration(old, extension)) {
     app_data_migrator_->DoMigrationAndReply(
-        old, extension, base::Bind(&ExtensionService::FinishInstallation,
-                                   AsWeakPtr(), base::RetainedRef(extension)));
+        old, extension,
+        base::BindOnce(&ExtensionService::FinishInstallation, AsWeakPtr(),
+                       base::RetainedRef(extension)));
     return;
   }