[base] Apply BindOnceRewriter in //chrome/browser/media_galleries

This change applies the BindOnceRewriter in //chrome/browser/media_galleries.
This rewriter replaces calls to base::Bind and base::BindRepeating with
calls to base::BindOnce, in case the result is immediately assigned to a
base::OnceCallback. Given that base::RepeatingCallback is implicitly
convertible to base::OnceCallback, there is no change in functionality.

Steps:
  1. run_tool.py --tool base_bind_rewriters \
                 --tool-arg='--rewriter=bind_to_bind_once'
  2. git cl format

This CL was uploaded by git cl split.

R=reillyg@chromium.org

Bug: 714018
Change-Id: I3d788cb9612f958da998ac7ad5446d21aa80d433
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2132408Reviewed-by: Reilly Grant <reillyg@chromium.org>
Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760414}

chrome/browser/media_galleries/chromeos/mtp_device_task_helper.cc

@@ -100,8 +100,9 @@ void MTPDeviceTaskHelper::OpenStorage(const std::string& storage_name,
   const std::string mode =
       read_only ? mtpd::kReadOnlyMode : mtpd::kReadWriteMode;
   GetMediaTransferProtocolManager()->OpenStorage(
-      storage_name, mode, base::Bind(&MTPDeviceTaskHelper::OnDidOpenStorage,
-                                     weak_ptr_factory_.GetWeakPtr(), callback));
+      storage_name, mode,
+      base::BindOnce(&MTPDeviceTaskHelper::OnDidOpenStorage,
+                     weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void MTPDeviceTaskHelper::GetFileInfo(
@@ -115,9 +116,9 @@ void MTPDeviceTaskHelper::GetFileInfo(
   const std::vector<uint32_t> file_ids = {file_id};
   GetMediaTransferProtocolManager()->GetFileInfo(
       device_handle_, file_ids,
-      base::Bind(&MTPDeviceTaskHelper::OnGetFileInfo,
-                 weak_ptr_factory_.GetWeakPtr(), success_callback,
-                 error_callback));
+      base::BindOnce(&MTPDeviceTaskHelper::OnGetFileInfo,
+                     weak_ptr_factory_.GetWeakPtr(), success_callback,
+                     error_callback));
 }
 
 void MTPDeviceTaskHelper::CreateDirectory(
@@ -131,9 +132,9 @@ void MTPDeviceTaskHelper::CreateDirectory(
 
   GetMediaTransferProtocolManager()->CreateDirectory(
       device_handle_, parent_id, directory_name,
-      base::Bind(&MTPDeviceTaskHelper::OnCreateDirectory,
-                 weak_ptr_factory_.GetWeakPtr(), success_callback,
-                 error_callback));
+      base::BindOnce(&MTPDeviceTaskHelper::OnCreateDirectory,
+                     weak_ptr_factory_.GetWeakPtr(), success_callback,
+                     error_callback));
 }
 
 void MTPDeviceTaskHelper::ReadDirectory(
@@ -204,9 +205,9 @@ void MTPDeviceTaskHelper::RenameObject(
 
   GetMediaTransferProtocolManager()->RenameObject(
       device_handle_, object_id, new_name,
-      base::Bind(&MTPDeviceTaskHelper::OnRenameObject,
-                 weak_ptr_factory_.GetWeakPtr(), success_callback,
-                 error_callback));
+      base::BindOnce(&MTPDeviceTaskHelper::OnRenameObject,
+                     weak_ptr_factory_.GetWeakPtr(), success_callback,
+                     error_callback));
 }
 
 MTPDeviceTaskHelper::MTPEntry::MTPEntry() : file_id(0) {}
@@ -223,9 +224,9 @@ void MTPDeviceTaskHelper::CopyFileFromLocal(
 
   GetMediaTransferProtocolManager()->CopyFileFromLocal(
       device_handle_, source_file_descriptor, parent_id, file_name,
-      base::Bind(&MTPDeviceTaskHelper::OnCopyFileFromLocal,
-                 weak_ptr_factory_.GetWeakPtr(), success_callback,
-                 error_callback));
+      base::BindOnce(&MTPDeviceTaskHelper::OnCopyFileFromLocal,
+                     weak_ptr_factory_.GetWeakPtr(), success_callback,
+                     error_callback));
 }
 
 void MTPDeviceTaskHelper::DeleteObject(
@@ -236,9 +237,9 @@ void MTPDeviceTaskHelper::DeleteObject(
 
   GetMediaTransferProtocolManager()->DeleteObject(
       device_handle_, object_id,
-      base::Bind(&MTPDeviceTaskHelper::OnDeleteObject,
-                 weak_ptr_factory_.GetWeakPtr(), success_callback,
-                 error_callback));
+      base::BindOnce(&MTPDeviceTaskHelper::OnDeleteObject,
+                     weak_ptr_factory_.GetWeakPtr(), success_callback,
+                     error_callback));
 }
 
 void MTPDeviceTaskHelper::CloseStorage() const {
@@ -428,8 +429,8 @@ void MTPDeviceTaskHelper::OnGetFileInfoToReadBytes(
   GetMediaTransferProtocolManager()->ReadFileChunk(
       device_handle_, request.file_id,
       base::checked_cast<uint32_t>(request.offset), bytes_to_read,
-      base::Bind(&MTPDeviceTaskHelper::OnDidReadBytes,
-                 weak_ptr_factory_.GetWeakPtr(), request, file_info));
+      base::BindOnce(&MTPDeviceTaskHelper::OnDidReadBytes,
+                     weak_ptr_factory_.GetWeakPtr(), request, file_info));
 }
 
 void MTPDeviceTaskHelper::OnDidReadBytes(

chrome/browser/media_galleries/chromeos/mtp_read_file_worker.cc

@@ -66,13 +66,12 @@ void MTPReadFileWorker::ReadDataChunkFromDeviceFile(
   auto* mtp_device_manager =
       StorageMonitor::GetInstance()->media_transfer_protocol_manager();
   mtp_device_manager->ReadFileChunk(
-      device_handle_,
-      snapshot_file_details_ptr->file_id(),
+      device_handle_, snapshot_file_details_ptr->file_id(),
       snapshot_file_details_ptr->bytes_written(),
       snapshot_file_details_ptr->BytesToRead(),
-      base::Bind(&MTPReadFileWorker::OnDidReadDataChunkFromDeviceFile,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 base::Passed(&snapshot_file_details)));
+      base::BindOnce(&MTPReadFileWorker::OnDidReadDataChunkFromDeviceFile,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     base::Passed(&snapshot_file_details)));
 }
 
 void MTPReadFileWorker::OnDidReadDataChunkFromDeviceFile(

chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc

@@ -201,7 +201,7 @@ class MediaFileValidatorTest : public InProcessBrowserTest {
                  const base::Callback<void(bool success)>& callback) {
     operation_runner()->GetMetadata(
         url, storage::FileSystemOperation::GET_METADATA_FIELD_SIZE,
-        base::Bind(&HandleCheckFileResult, expected_size, callback));
+        base::BindOnce(&HandleCheckFileResult, expected_size, callback));
   }
 
   // Helper that checks the result of |move_src_| lookup and then checks
@@ -222,12 +222,10 @@ class MediaFileValidatorTest : public InProcessBrowserTest {
   // |move_src_| to |move_dest_|.
   void OnTestFilesReady(bool expected_result, bool test_files_ready) {
     ASSERT_TRUE(test_files_ready);
-    operation_runner()->Move(move_src_,
-                             move_dest_,
-                             storage::FileSystemOperation::OPTION_NONE,
-                             base::Bind(&MediaFileValidatorTest::OnMoveResult,
-                                        base::Unretained(this),
-                                        expected_result));
+    operation_runner()->Move(
+        move_src_, move_dest_, storage::FileSystemOperation::OPTION_NONE,
+        base::BindOnce(&MediaFileValidatorTest::OnMoveResult,
+                       base::Unretained(this), expected_result));
   }
 
   // Check that the move succeeded/failed based on expectation and then

chrome/browser/media_galleries/fileapi/native_media_file_util.cc

@@ -62,7 +62,7 @@ void DidOpenSnapshot(storage::AsyncFileUtil::CreateOrOpenCallback callback,
     return;
   }
   std::move(callback).Run(std::move(file),
-                          base::Bind(&HoldFileRef, std::move(file_ref)));
+                          base::BindOnce(&HoldFileRef, std::move(file_ref)));
 }
 
 }  // namespace

chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc

@@ -212,10 +212,10 @@ TEST_F(NativeMediaFileUtilTest, DirectoryExistsAndFileExistsFiltering) {
         base::StringPrintf("DirectoryExistsAndFileExistsFiltering %" PRIuS, i);
     if (kFilteringTestCases[i].is_directory) {
       operation_runner()->DirectoryExists(
-          url, base::Bind(&ExpectEqHelper, test_name, expectation));
+          url, base::BindOnce(&ExpectEqHelper, test_name, expectation));
     } else {
       operation_runner()->FileExists(
-          url, base::Bind(&ExpectEqHelper, test_name, expectation));
+          url, base::BindOnce(&ExpectEqHelper, test_name, expectation));
     }
     content::RunAllTasksUntilIdle();
   }
@@ -259,7 +259,7 @@ TEST_F(NativeMediaFileUtilTest, CreateDirectoryFiltering) {
                                             : base::File::FILE_ERROR_SECURITY;
         operation_runner()->CreateDirectory(
             url, false, false,
-            base::Bind(&ExpectEqHelper, test_name, expectation));
+            base::BindOnce(&ExpectEqHelper, test_name, expectation));
       }
       content::RunAllTasksUntilIdle();
     }
@@ -299,7 +299,7 @@ TEST_F(NativeMediaFileUtilTest, CopySourceFiltering) {
           url, dest_url, storage::FileSystemOperation::OPTION_NONE,
           storage::FileSystemOperation::ERROR_BEHAVIOR_ABORT,
           storage::FileSystemOperationRunner::CopyProgressCallback(),
-          base::Bind(&ExpectEqHelper, test_name, expectation));
+          base::BindOnce(&ExpectEqHelper, test_name, expectation));
       content::RunAllTasksUntilIdle();
     }
   }
@@ -363,7 +363,7 @@ TEST_F(NativeMediaFileUtilTest, CopyDestFiltering) {
           src_url, url, storage::FileSystemOperation::OPTION_NONE,
           storage::FileSystemOperation::ERROR_BEHAVIOR_ABORT,
           storage::FileSystemOperationRunner::CopyProgressCallback(),
-          base::Bind(&ExpectEqHelper, test_name, expectation));
+          base::BindOnce(&ExpectEqHelper, test_name, expectation));
       content::RunAllTasksUntilIdle();
     }
   }
@@ -400,7 +400,7 @@ TEST_F(NativeMediaFileUtilTest, MoveSourceFiltering) {
       }
       operation_runner()->Move(
           url, dest_url, storage::FileSystemOperation::OPTION_NONE,
-          base::Bind(&ExpectEqHelper, test_name, expectation));
+          base::BindOnce(&ExpectEqHelper, test_name, expectation));
       content::RunAllTasksUntilIdle();
     }
   }
@@ -463,7 +463,7 @@ TEST_F(NativeMediaFileUtilTest, MoveDestFiltering) {
       }
       operation_runner()->Move(
           src_url, url, storage::FileSystemOperation::OPTION_NONE,
-          base::Bind(&ExpectEqHelper, test_name, expectation));
+          base::BindOnce(&ExpectEqHelper, test_name, expectation));
       content::RunAllTasksUntilIdle();
     }
   }
@@ -489,8 +489,8 @@ TEST_F(NativeMediaFileUtilTest, GetMetadataFiltering) {
       }
       operation_runner()->GetMetadata(
           url, storage::FileSystemOperation::GET_METADATA_FIELD_IS_DIRECTORY,
-          base::Bind(&ExpectMetadataEqHelper, test_name, expectation,
-                     kFilteringTestCases[i].is_directory));
+          base::BindOnce(&ExpectMetadataEqHelper, test_name, expectation,
+                         kFilteringTestCases[i].is_directory));
       content::RunAllTasksUntilIdle();
     }
   }
@@ -517,7 +517,7 @@ TEST_F(NativeMediaFileUtilTest, RemoveFileFiltering) {
         expectation = base::File::FILE_ERROR_NOT_A_FILE;
       }
       operation_runner()->RemoveFile(
-          url, base::Bind(&ExpectEqHelper, test_name, expectation));
+          url, base::BindOnce(&ExpectEqHelper, test_name, expectation));
       content::RunAllTasksUntilIdle();
     }
   }
@@ -548,7 +548,7 @@ TEST_F(NativeMediaFileUtilTest, CreateSnapshot) {
       expected_error = base::File::FILE_ERROR_SECURITY;
     error = base::File::FILE_ERROR_FAILED;
     operation_runner()->CreateSnapshotFile(
-        url, base::Bind(CreateSnapshotCallback, &error));
+        url, base::BindOnce(CreateSnapshotCallback, &error));
     content::RunAllTasksUntilIdle();
     ASSERT_EQ(expected_error, error);
   }

chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc

@@ -105,8 +105,8 @@ void ReadaheadFileStreamReader::ReadFromSourceIfNeeded() {
       base::MakeRefCounted<net::IOBuffer>(kBufferSize);
   int result = source_->Read(
       buf.get(), kBufferSize,
-      base::Bind(&ReadaheadFileStreamReader::OnFinishReadFromSource,
-                 weak_factory_.GetWeakPtr(), base::RetainedRef(buf)));
+      base::BindOnce(&ReadaheadFileStreamReader::OnFinishReadFromSource,
+                     weak_factory_.GetWeakPtr(), base::RetainedRef(buf)));
 
   if (result != net::ERR_IO_PENDING)
     OnFinishReadFromSource(buf.get(), result);

chrome/browser/media_galleries/media_file_system_registry.cc

@@ -311,9 +311,12 @@ class ExtensionGalleriesHost
     for (auto id = galleries.begin(); id != galleries.end(); ++id) {
       device_ids->insert(galleries_info.find(*id)->second.device_id);
     }
-    MediaStorageUtil::FilterAttachedDevices(device_ids, base::Bind(
-        &ExtensionGalleriesHost::GetMediaFileSystemsForAttachedDevices, this,
-        base::Owned(device_ids), galleries, galleries_info, callback));
+    MediaStorageUtil::FilterAttachedDevices(
+        device_ids,
+        base::BindOnce(
+            &ExtensionGalleriesHost::GetMediaFileSystemsForAttachedDevices,
+            this, base::Owned(device_ids), galleries, galleries_info,
+            callback));
   }
 
   // Checks if |gallery| is attached and if so, registers the file system and
@@ -327,9 +330,9 @@ class ExtensionGalleriesHost
     device_ids->insert(gallery.device_id);
     MediaStorageUtil::FilterAttachedDevices(
         device_ids,
-        base::Bind(&ExtensionGalleriesHost::RegisterAttachedMediaFileSystem,
-                   this, base::Owned(device_ids), gallery,
-                   base::Passed(&callback)));
+        base::BindOnce(&ExtensionGalleriesHost::RegisterAttachedMediaFileSystem,
+                       this, base::Owned(device_ids), gallery,
+                       base::Passed(&callback)));
   }
 
   // Revoke the file system for |id| if this extension has created one for |id|.

chrome/browser/media_galleries/media_galleries_preferences.cc

@@ -486,9 +486,8 @@ void MediaGalleriesPreferences::EnsureInitialized(base::OnceClosure callback) {
   // return and add media galleries to it (hence why the APIHasBeenUsed check
   // needs to happen here rather than inside OnStorageMonitorInit itself).
   StorageMonitor::GetInstance()->EnsureInitialized(
-      base::Bind(&MediaGalleriesPreferences::OnStorageMonitorInit,
-                 weak_factory_.GetWeakPtr(),
-                 APIHasBeenUsed(profile_)));
+      base::BindOnce(&MediaGalleriesPreferences::OnStorageMonitorInit,
+                     weak_factory_.GetWeakPtr(), APIHasBeenUsed(profile_)));
 }
 
 bool MediaGalleriesPreferences::IsInitialized() const { return initialized_; }