[Code health] Convert ErrorCallback to OnceCallback.

This was recently marked as RepeatingCallback, but should actually be
OnceCallback, as it's fired at most once.

MTPDeviceDelegateImplLinux does at times try to pass this callback off
to more than one owner, however this is an implementation detail that
should not make it into the public API. To circumvent this hurdle, a
wrapper is introduced in MTPDeviceDelegateImplLinux.

Bug: 1152278
Change-Id: Ie00927fad8f8fa95961380fcd391e6b463263a23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2598010Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840231}

chrome/browser/media_galleries/chromeos/mtp_device_task_helper.h

@@ -87,13 +87,13 @@ class MTPDeviceTaskHelper {
   // notify the caller about the file error.
   void GetFileInfo(uint32_t file_id,
                    GetFileInfoSuccessCallback success_callback,
-                   const ErrorCallback& error_callback);
+                   ErrorCallback error_callback);
 
   // Forwards CreateDirectory request to the MediaTransferProtocolManager.
   void CreateDirectory(const uint32_t parent_id,
                        const std::string& directory_name,
                        const CreateDirectorySuccessCallback& success_callback,
-                       const ErrorCallback& error_callback);
+                       ErrorCallback error_callback);
 
   // Dispatches the read directory request to the MediaTransferProtocolManager.
   //
@@ -110,7 +110,7 @@ class MTPDeviceTaskHelper {
   // notify the caller about the file error.
   void ReadDirectory(const uint32_t directory_id,
                      const ReadDirectorySuccessCallback& success_callback,
-                     const ErrorCallback& error_callback);
+                     ErrorCallback error_callback);
 
   // Dispatches a read directory request to the MediaTransferProtocolManager to
   // check if |directory_id| is empty.
@@ -122,16 +122,15 @@ class MTPDeviceTaskHelper {
   // notify the caller about the file error.
   void CheckDirectoryEmpty(uint32_t directory_id,
                            CheckDirectoryEmptySuccessCallback success_callback,
-                           const ErrorCallback& error_callback);
+                           ErrorCallback error_callback);
 
   // Forwards the WriteDataIntoSnapshotFile request to the MTPReadFileWorker
   // object.
   //
   // |request_info| specifies the snapshot file request params.
   // |snapshot_file_info| specifies the metadata of the snapshot file.
-  void WriteDataIntoSnapshotFile(
-      const SnapshotRequestInfo& request_info,
-      const base::File::Info& snapshot_file_info);
+  void WriteDataIntoSnapshotFile(SnapshotRequestInfo request_info,
+                                 const base::File::Info& snapshot_file_info);
 
   // Dispatches the read bytes request to the MediaTransferProtocolManager.
   //
@@ -144,7 +143,7 @@ class MTPDeviceTaskHelper {
   void RenameObject(const uint32_t object_id,
                     const std::string& new_name,
                     const RenameObjectSuccessCallback& success_callback,
-                    const ErrorCallback& error_callback);
+                    ErrorCallback error_callback);
 
   // Forwards CopyFileFromLocal request to the MediaTransferProtocolManager.
   void CopyFileFromLocal(
@@ -153,12 +152,12 @@ class MTPDeviceTaskHelper {
       const uint32_t parent_id,
       const std::string& file_name,
       const CopyFileFromLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback);
+      ErrorCallback error_callback);
 
   // Forwards DeleteObject request to the MediaTransferProtocolManager.
   void DeleteObject(const uint32_t object_id,
                     const DeleteObjectSuccessCallback& success_callback,
-                    const ErrorCallback& error_callback);
+                    ErrorCallback error_callback);
 
   // Dispatches the CloseStorage request to the MediaTransferProtocolManager.
   void CloseStorage() const;
@@ -185,13 +184,13 @@ class MTPDeviceTaskHelper {
   // error has occurred. In this case, |error_callback| is invoked on the IO
   // thread to notify the caller.
   void OnGetFileInfo(GetFileInfoSuccessCallback success_callback,
-                     const ErrorCallback& error_callback,
+                     ErrorCallback error_callback,
                      std::vector<device::mojom::MtpFileEntryPtr> entries,
                      bool error) const;
 
   // Called when CreateDirectory completes.
   void OnCreateDirectory(const CreateDirectorySuccessCallback& success_callback,
-                         const ErrorCallback& error_callback,
+                         ErrorCallback error_callback,
                          const bool error) const;
 
   // Query callback for ReadDirectoryEntryIds().
@@ -205,7 +204,7 @@ class MTPDeviceTaskHelper {
   // invoked on the IO thread to notify the caller.
   void OnReadDirectoryEntryIdsToReadDirectory(
       const ReadDirectorySuccessCallback& success_callback,
-      const ErrorCallback& error_callback,
+      ErrorCallback error_callback,
       const std::vector<uint32_t>& file_ids,
       bool error);
 
@@ -220,7 +219,7 @@ class MTPDeviceTaskHelper {
   // |error| indicates if the GetFileInfo() call succeeded or failed.
   void OnGotDirectoryEntries(
       const ReadDirectorySuccessCallback& success_callback,
-      const ErrorCallback& error_callback,
+      ErrorCallback error_callback,
       const std::vector<uint32_t>& expected_file_ids,
       const std::vector<uint32_t>& file_ids_to_read,
       std::vector<device::mojom::MtpFileEntryPtr> file_entries,
@@ -236,7 +235,7 @@ class MTPDeviceTaskHelper {
   // and |error_callback| is invoked on the IO thread to notify the caller.
   void OnCheckedDirectoryEmpty(
       CheckDirectoryEmptySuccessCallback success_callback,
-      const ErrorCallback& error_callback,
+      ErrorCallback error_callback,
       const std::vector<uint32_t>& file_ids,
       bool error) const;
 
@@ -262,25 +261,25 @@ class MTPDeviceTaskHelper {
 
   // Called when RenameObject completes.
   void OnRenameObject(const RenameObjectSuccessCallback& success_callback,
-                      const ErrorCallback& error_callback,
+                      ErrorCallback error_callback,
                       const bool error) const;
 
   // Called when CopyFileFromLocal completes.
   void OnCopyFileFromLocal(
       const CopyFileFromLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback,
+      ErrorCallback error_callback,
       const bool error) const;
 
   // Called when DeleteObject completes.
   void OnDeleteObject(const DeleteObjectSuccessCallback& success_callback,
-                      const ErrorCallback& error_callback,
+                      ErrorCallback error_callback,
                       const bool error) const;
 
   // Called when the device is uninitialized.
   //
   // Runs |error_callback| on the IO thread to notify the caller about the
   // device |error|.
-  void HandleDeviceError(const ErrorCallback& error_callback,
+  void HandleDeviceError(ErrorCallback error_callback,
                          base::File::Error error) const;
 
   // Handle to communicate with the MTP device.

chrome/browser/media_galleries/chromeos/mtp_read_file_worker.cc

@@ -46,11 +46,11 @@ MTPReadFileWorker::~MTPReadFileWorker() {
 }
 
 void MTPReadFileWorker::WriteDataIntoSnapshotFile(
-    const SnapshotRequestInfo& request_info,
+    SnapshotRequestInfo request_info,
     const base::File::Info& snapshot_file_info) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  ReadDataChunkFromDeviceFile(
-      std::make_unique<SnapshotFileDetails>(request_info, snapshot_file_info));
+  ReadDataChunkFromDeviceFile(std::make_unique<SnapshotFileDetails>(
+      std::move(request_info), snapshot_file_info));
 }
 
 void MTPReadFileWorker::ReadDataChunkFromDeviceFile(

chrome/browser/media_galleries/chromeos/mtp_read_file_worker.h

@@ -30,9 +30,8 @@ class MTPReadFileWorker {
   //
   // |request_info| specifies the snapshot file request params.
   // |snapshot_file_info| specifies the metadata of the snapshot file.
-  void WriteDataIntoSnapshotFile(
-      const SnapshotRequestInfo& request_info,
-      const base::File::Info& snapshot_file_info);
+  void WriteDataIntoSnapshotFile(SnapshotRequestInfo request_info,
+                                 const base::File::Info& snapshot_file_info);
 
  private:
   // Called when WriteDataIntoSnapshotFile() completes.

chrome/browser/media_galleries/chromeos/snapshot_file_details.cc

@@ -17,33 +17,28 @@ SnapshotRequestInfo::SnapshotRequestInfo(
     const base::FilePath& snapshot_file_path,
     const MTPDeviceAsyncDelegate::CreateSnapshotFileSuccessCallback&
         success_callback,
-    const MTPDeviceAsyncDelegate::ErrorCallback& error_callback)
+    MTPDeviceAsyncDelegate::ErrorCallback error_callback)
     : file_id(file_id),
       snapshot_file_path(snapshot_file_path),
       success_callback(success_callback),
-      error_callback(error_callback) {}
+      error_callback(std::move(error_callback)) {}
 
-SnapshotRequestInfo::SnapshotRequestInfo(const SnapshotRequestInfo& other) =
-    default;
+SnapshotRequestInfo::SnapshotRequestInfo(SnapshotRequestInfo&& other) = default;
 
-SnapshotRequestInfo::~SnapshotRequestInfo() {
-}
+SnapshotRequestInfo::~SnapshotRequestInfo() = default;
 
 ////////////////////////////////////////////////////////////////////////////////
 //                             SnapshotFileDetails                            //
 ////////////////////////////////////////////////////////////////////////////////
 
-SnapshotFileDetails::SnapshotFileDetails(
-    const SnapshotRequestInfo& request_info,
-    const base::File::Info& file_info)
-    : request_info_(request_info),
+SnapshotFileDetails::SnapshotFileDetails(SnapshotRequestInfo request_info,
+                                         const base::File::Info& file_info)
+    : request_info_(std::move(request_info)),
       file_info_(file_info),
       bytes_written_(0),
-      error_occurred_(false) {
-}
+      error_occurred_(false) {}
 
-SnapshotFileDetails::~SnapshotFileDetails() {
-}
+SnapshotFileDetails::~SnapshotFileDetails() = default;
 
 void SnapshotFileDetails::set_error_occurred(bool error) {
   error_occurred_ = error;

chrome/browser/media_galleries/chromeos/snapshot_file_details.h

@@ -22,8 +22,10 @@ struct SnapshotRequestInfo {
       const base::FilePath& snapshot_file_path,
       const MTPDeviceAsyncDelegate::CreateSnapshotFileSuccessCallback&
           success_callback,
-      const MTPDeviceAsyncDelegate::ErrorCallback& error_callback);
-  SnapshotRequestInfo(const SnapshotRequestInfo& other);
+      MTPDeviceAsyncDelegate::ErrorCallback error_callback);
+  SnapshotRequestInfo(SnapshotRequestInfo&& other);
+  SnapshotRequestInfo(const SnapshotRequestInfo& other) = delete;
+  SnapshotRequestInfo& operator=(const SnapshotRequestInfo& other) = delete;
   ~SnapshotRequestInfo();
 
   // MTP device file id.
@@ -37,7 +39,7 @@ struct SnapshotRequestInfo {
       success_callback;
 
   // A callback to be called when CreateSnapshotFile() fails.
-  const MTPDeviceAsyncDelegate::ErrorCallback error_callback;
+  MTPDeviceAsyncDelegate::ErrorCallback error_callback;
 };
 
 // SnapshotFileDetails tracks the current state of the snapshot file (e.g how
@@ -45,7 +47,7 @@ struct SnapshotRequestInfo {
 // metadata information, etc).
 class SnapshotFileDetails {
  public:
-  SnapshotFileDetails(const SnapshotRequestInfo& request_info,
+  SnapshotFileDetails(SnapshotRequestInfo request_info,
                       const base::File::Info& file_info);
 
   ~SnapshotFileDetails();
@@ -67,8 +69,8 @@ class SnapshotFileDetails {
     return request_info_.success_callback;
   }
 
-  const MTPDeviceAsyncDelegate::ErrorCallback error_callback() const {
-    return request_info_.error_callback;
+  MTPDeviceAsyncDelegate::ErrorCallback error_callback() {
+    return std::move(request_info_.error_callback);
   }
 
   bool error_occurred() const {
@@ -94,7 +96,7 @@ class SnapshotFileDetails {
 
  private:
   // Snapshot file request params.
-  const SnapshotRequestInfo request_info_;
+  SnapshotRequestInfo request_info_;
 
   // Metadata of the snapshot file (such as name, size, type, etc).
   const base::File::Info file_info_;

chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.cc

@@ -12,13 +12,13 @@ MTPDeviceAsyncDelegate::ReadBytesRequest::ReadBytesRequest(
     int64_t offset,
     int buf_len,
     ReadBytesSuccessCallback success_callback,
-    const ErrorCallback& error_callback)
+    ErrorCallback error_callback)
     : file_id(file_id),
       buf(buf),
       offset(offset),
       buf_len(buf_len),
       success_callback(std::move(success_callback)),
-      error_callback(error_callback) {}
+      error_callback(std::move(error_callback)) {}
 
 MTPDeviceAsyncDelegate::ReadBytesRequest::ReadBytesRequest(
     ReadBytesRequest&& other)
@@ -27,6 +27,6 @@ MTPDeviceAsyncDelegate::ReadBytesRequest::ReadBytesRequest(
       offset(other.offset),
       buf_len(other.buf_len),
       success_callback(std::move(other.success_callback)),
-      error_callback(other.error_callback) {}
+      error_callback(std::move(other.error_callback)) {}
 
-MTPDeviceAsyncDelegate::ReadBytesRequest::~ReadBytesRequest() {}
+MTPDeviceAsyncDelegate::ReadBytesRequest::~ReadBytesRequest() = default;

chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h

@@ -43,7 +43,7 @@ class MTPDeviceAsyncDelegate {
 
   // A callback to be called when GetFileInfo/ReadDirectory/CreateSnapshot
   // method call fails.
-  typedef base::RepeatingCallback<void(base::File::Error error)> ErrorCallback;
+  using ErrorCallback = base::OnceCallback<void(base::File::Error error)>;
 
   // A callback to be called when CreateSnapshotFile method call succeeds.
   // TODO: consider make this a OnceCallback. Right now it is repeating because
@@ -64,7 +64,7 @@ class MTPDeviceAsyncDelegate {
                      int64_t offset,
                      int buf_len,
                      ReadBytesSuccessCallback success_callback,
-                     const ErrorCallback& error_callback);
+                     ErrorCallback error_callback);
     ReadBytesRequest(ReadBytesRequest&& other);
     ~ReadBytesRequest();
 
@@ -103,7 +103,7 @@ class MTPDeviceAsyncDelegate {
   // callback asynchronously when complete.
   virtual void GetFileInfo(const base::FilePath& file_path,
                            GetFileInfoSuccessCallback success_callback,
-                           const ErrorCallback& error_callback) = 0;
+                           ErrorCallback error_callback) = 0;
 
   // Creates a directory to |directory_path|. When |exclusive| is true, this
   // returns base::File::FILE_ERROR_EXISTS if a directory already exists for
@@ -114,14 +114,14 @@ class MTPDeviceAsyncDelegate {
       const bool exclusive,
       const bool recursive,
       const CreateDirectorySuccessCallback& success_callback,
-      const ErrorCallback& error_callback) = 0;
+      ErrorCallback error_callback) = 0;
 
   // Enumerates the |root| directory contents and invokes the appropriate
   // callback asynchronously when complete.
   virtual void ReadDirectory(
       const base::FilePath& root,
       const ReadDirectorySuccessCallback& success_callback,
-      const ErrorCallback& error_callback) = 0;
+      ErrorCallback error_callback) = 0;
 
   // Copy the contents of |device_file_path| to |local_path|. Invokes the
   // appropriate callback asynchronously when complete.
@@ -129,7 +129,7 @@ class MTPDeviceAsyncDelegate {
       const base::FilePath& device_file_path,
       const base::FilePath& local_path,
       const CreateSnapshotFileSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) = 0;
+      ErrorCallback error_callback) = 0;
 
   // Platform-specific implementations that are streaming don't create a local
   // snapshot file. Blobs are instead FileSystemURL backed and read in a stream.
@@ -143,7 +143,7 @@ class MTPDeviceAsyncDelegate {
                          int64_t offset,
                          int buf_len,
                          ReadBytesSuccessCallback success_callback,
-                         const ErrorCallback& error_callback) = 0;
+                         ErrorCallback error_callback) = 0;
 
   // Returns true if storage is opened for read only.
   virtual bool IsReadOnly() const = 0;
@@ -156,7 +156,7 @@ class MTPDeviceAsyncDelegate {
       const CreateTemporaryFileCallback& create_temporary_file_callback,
       const CopyFileProgressCallback& progress_callback,
       const CopyFileLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) = 0;
+      ErrorCallback error_callback) = 0;
 
   // Moves a file |source_file_path| to |device_file_path|.
   // |create_temporary_file_callback| can be used to create a temporary file.
@@ -165,25 +165,25 @@ class MTPDeviceAsyncDelegate {
       const base::FilePath& device_file_path,
       const CreateTemporaryFileCallback& create_temporary_file_callback,
       const MoveFileLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) = 0;
+      ErrorCallback error_callback) = 0;
 
   // Copies a file from |source_file_path| to |device_file_path|.
   virtual void CopyFileFromLocal(
       const base::FilePath& source_file_path,
       const base::FilePath& device_file_path,
       const CopyFileFromLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) = 0;
+      ErrorCallback error_callback) = 0;
 
   // Deletes a file at |file_path|.
   virtual void DeleteFile(const base::FilePath& file_path,
                           const DeleteFileSuccessCallback& success_callback,
-                          const ErrorCallback& error_callback) = 0;
+                          ErrorCallback error_callback) = 0;
 
   // Deletes a directory at |file_path|. The directory must be empty.
   virtual void DeleteDirectory(
       const base::FilePath& file_path,
       const DeleteDirectorySuccessCallback& success_callback,
-      const ErrorCallback& error_callback) = 0;
+      ErrorCallback error_callback) = 0;
 
   // Adds watcher to |file_path| as |origin|.
   virtual void AddWatcher(

chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h

@@ -37,32 +37,32 @@ class MTPDeviceDelegateImplMac : public MTPDeviceAsyncDelegate {
   // similarly-named methods on the UI thread.
   void GetFileInfo(const base::FilePath& file_path,
                    GetFileInfoSuccessCallback success_callback,
-                   const ErrorCallback& error_callback) override;
+                   ErrorCallback error_callback) override;
 
   void CreateDirectory(const base::FilePath& directory_path,
                        const bool exclusive,
                        const bool recursive,
                        const CreateDirectorySuccessCallback& success_callback,
-                       const ErrorCallback& error_callback) override;
+                       ErrorCallback error_callback) override;
 
   // Note: passed absolute paths, but expects relative paths in reply.
   void ReadDirectory(const base::FilePath& root,
                      const ReadDirectorySuccessCallback& success_callback,
-                     const ErrorCallback& error_callback) override;
+                     ErrorCallback error_callback) override;
 
   // Note: passed absolute paths.
   void CreateSnapshotFile(
       const base::FilePath& device_file_path,
       const base::FilePath& local_path,
       const CreateSnapshotFileSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) override;
+      ErrorCallback error_callback) override;
   bool IsStreaming() override;
   void ReadBytes(const base::FilePath& device_file_path,
                  const scoped_refptr<net::IOBuffer>& buf,
                  int64_t offset,
                  int buf_len,
                  ReadBytesSuccessCallback success_callback,
-                 const ErrorCallback& error_callback) override;
+                 ErrorCallback error_callback) override;
   bool IsReadOnly() const override;
   void CopyFileLocal(
       const base::FilePath& source_file_path,
@@ -70,24 +70,24 @@ class MTPDeviceDelegateImplMac : public MTPDeviceAsyncDelegate {
       const CreateTemporaryFileCallback& create_temporary_file_callback,
       const CopyFileProgressCallback& progress_callback,
       const CopyFileLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) override;
+      ErrorCallback error_callback) override;
   void MoveFileLocal(
       const base::FilePath& source_file_path,
       const base::FilePath& device_file_path,
       const CreateTemporaryFileCallback& create_temporary_file_callback,
       const MoveFileLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) override;
+      ErrorCallback error_callback) override;
   void CopyFileFromLocal(
       const base::FilePath& source_file_path,
       const base::FilePath& device_file_path,
       const CopyFileFromLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) override;
+      ErrorCallback error_callback) override;
   void DeleteFile(const base::FilePath& file_path,
                   const DeleteFileSuccessCallback& success_callback,
-                  const ErrorCallback& error_callback) override;
+                  ErrorCallback error_callback) override;
   void DeleteDirectory(const base::FilePath& file_path,
                        const DeleteDirectorySuccessCallback& success_callback,
-                       const ErrorCallback& error_callback) override;
+                       ErrorCallback error_callback) override;
   void AddWatcher(const GURL& origin,
                   const base::FilePath& file_path,
                   const bool recursive,
@@ -124,17 +124,15 @@ class MTPDeviceDelegateImplMac : public MTPDeviceAsyncDelegate {
                        base::File::Error* error);
 
   // Delegate for ReadDirectory, called on the UI thread.
-  void ReadDirectoryImpl(
-      const base::FilePath& root,
-      const ReadDirectorySuccessCallback& success_callback,
-      const ErrorCallback& error_callback);
+  void ReadDirectoryImpl(const base::FilePath& root,
+                         const ReadDirectorySuccessCallback& success_callback,
+                         ErrorCallback error_callback);
 
   // Delegate for CreateSnapshotFile, called on the UI thread.
-  void DownloadFile(
-      const base::FilePath& device_file_path,
-      const base::FilePath& local_path,
-      const CreateSnapshotFileSuccessCallback& success_callback,
-      const ErrorCallback& error_callback);
+  void DownloadFile(const base::FilePath& device_file_path,
+                    const base::FilePath& local_path,
+                    const CreateSnapshotFileSuccessCallback& success_callback,
+                    ErrorCallback error_callback);
 
   // Public for closures; should not be called except by
   // CancelTasksAndDeleteDelegate.
@@ -168,7 +166,6 @@ class MTPDeviceDelegateImplMac : public MTPDeviceAsyncDelegate {
                     const base::FilePath& snapshot_filename,
                     CreateSnapshotFileSuccessCallback success_cb,
                     ErrorCallback error_cb);
-    ReadFileRequest(const ReadFileRequest& other);
     ~ReadFileRequest();
 
     std::string request_file;
@@ -183,7 +180,6 @@ class MTPDeviceDelegateImplMac : public MTPDeviceAsyncDelegate {
     ReadDirectoryRequest(const base::FilePath& dir,
                          ReadDirectorySuccessCallback success_cb,
                          ErrorCallback error_cb);
-    ReadDirectoryRequest(const ReadDirectoryRequest& other);
     ~ReadDirectoryRequest();
 
     base::FilePath directory;

chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc

@@ -273,13 +273,14 @@ base::File::Error GetFileStreamOnBlockingPoolThread(
 // Returns the total number of bytes written to the snapshot file for non-empty
 // files, or 0 on failure. For empty files, just return 0.
 DWORD WriteDataChunkIntoSnapshotFileOnBlockingPoolThread(
-    const SnapshotFileDetails& file_details) {
-  if (file_details.file_info().size == 0)
+    const base::File::Info& file_info,
+    Microsoft::WRL::ComPtr<IStream> device_file_stream,
+    const base::FilePath& snapshot_file_path,
+    DWORD optimal_transfer_size) {
+  if (file_info.size == 0)
     return 0;
   return media_transfer_protocol::CopyDataChunkToLocalFile(
-      file_details.device_file_stream(),
-      file_details.request_info().snapshot_file_path,
-      file_details.optimal_transfer_size());
+      device_file_stream.Get(), snapshot_file_path, optimal_transfer_size);
 }
 
 void DeletePortableDeviceOnBlockingPoolThread(
@@ -376,7 +377,7 @@ MTPDeviceDelegateImplWin::~MTPDeviceDelegateImplWin() {
 void MTPDeviceDelegateImplWin::GetFileInfo(
     const base::FilePath& file_path,
     GetFileInfoSuccessCallback success_callback,
-    const ErrorCallback& error_callback) {
+    ErrorCallback error_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(!file_path.empty());
   base::File::Info* file_info = new base::File::Info;
@@ -386,7 +387,7 @@ void MTPDeviceDelegateImplWin::GetFileInfo(
                      file_path, base::Unretained(file_info)),
       base::BindOnce(&MTPDeviceDelegateImplWin::OnGetFileInfo,
                      weak_ptr_factory_.GetWeakPtr(),
-                     std::move(success_callback), error_callback,
+                     std::move(success_callback), std::move(error_callback),
                      base::Owned(file_info))));
 }
 
@@ -395,14 +396,14 @@ void MTPDeviceDelegateImplWin::CreateDirectory(
     const bool exclusive,
     const bool recursive,
     const CreateDirectorySuccessCallback& success_callback,
-    const ErrorCallback& error_callback) {
+    ErrorCallback error_callback) {
   NOTREACHED();
 }
 
 void MTPDeviceDelegateImplWin::ReadDirectory(
     const base::FilePath& root,
     const ReadDirectorySuccessCallback& success_callback,
-    const ErrorCallback& error_callback) {
+    ErrorCallback error_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(!root.empty());
   storage::AsyncFileUtil::EntryList* entries =
@@ -413,20 +414,20 @@ void MTPDeviceDelegateImplWin::ReadDirectory(
                      root, base::Unretained(entries)),
       base::BindOnce(&MTPDeviceDelegateImplWin::OnDidReadDirectory,
                      weak_ptr_factory_.GetWeakPtr(), success_callback,
-                     error_callback, base::Owned(entries))));
+                     std::move(error_callback), base::Owned(entries))));
 }
 
 void MTPDeviceDelegateImplWin::CreateSnapshotFile(
     const base::FilePath& device_file_path,
     const base::FilePath& snapshot_file_path,
     const CreateSnapshotFileSuccessCallback& success_callback,
-    const ErrorCallback& error_callback) {
+    ErrorCallback error_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(!device_file_path.empty());
   DCHECK(!snapshot_file_path.empty());
   std::unique_ptr<SnapshotFileDetails> file_details(new SnapshotFileDetails(
       SnapshotRequestInfo(device_file_path, snapshot_file_path,
-                          success_callback, error_callback)));
+                          success_callback, std::move(error_callback))));
   // Passing a raw SnapshotFileDetails* to the blocking pool is safe, because
   // it is owned by |file_details| in the reply callback.
   EnsureInitAndRunTask(PendingTaskInfo(
@@ -447,7 +448,7 @@ void MTPDeviceDelegateImplWin::ReadBytes(
     int64_t offset,
     int buf_len,
     ReadBytesSuccessCallback success_callback,
-    const ErrorCallback& error_callback) {
+    ErrorCallback error_callback) {
   NOTREACHED();
 }
 
@@ -461,7 +462,7 @@ void MTPDeviceDelegateImplWin::CopyFileLocal(
     const CreateTemporaryFileCallback& create_temporary_file_callback,
     const CopyFileProgressCallback& progress_callback,
     const CopyFileLocalSuccessCallback& success_callback,
-    const ErrorCallback& error_callback) {
+    ErrorCallback error_callback) {
   NOTREACHED();
 }
 
@@ -470,7 +471,7 @@ void MTPDeviceDelegateImplWin::MoveFileLocal(
     const base::FilePath& device_file_path,
     const CreateTemporaryFileCallback& create_temporary_file_callback,
     const MoveFileLocalSuccessCallback& success_callback,
-    const ErrorCallback& error_callback) {
+    ErrorCallback error_callback) {
   NOTREACHED();
 }
 
@@ -478,21 +479,21 @@ void MTPDeviceDelegateImplWin::CopyFileFromLocal(
     const base::FilePath& source_file_path,
     const base::FilePath& device_file_path,
     const CopyFileFromLocalSuccessCallback& success_callback,
-    const ErrorCallback& error_callback) {
+    ErrorCallback error_callback) {
   NOTREACHED();
 }
 
 void MTPDeviceDelegateImplWin::DeleteFile(
     const base::FilePath& file_path,
     const DeleteFileSuccessCallback& success_callback,
-    const ErrorCallback& error_callback) {
+    ErrorCallback error_callback) {
   NOTREACHED();
 }
 
 void MTPDeviceDelegateImplWin::DeleteDirectory(
     const base::FilePath& file_path,
     const DeleteDirectorySuccessCallback& success_callback,
-    const ErrorCallback& error_callback) {
+    ErrorCallback error_callback) {
   NOTREACHED();
 }
 
@@ -557,8 +558,13 @@ void MTPDeviceDelegateImplWin::WriteDataChunkIntoSnapshotFile() {
   DCHECK(current_snapshot_details_.get());
   base::PostTaskAndReplyWithResult(
       media_task_runner_.get(), FROM_HERE,
-      base::BindOnce(&WriteDataChunkIntoSnapshotFileOnBlockingPoolThread,
-                     *current_snapshot_details_),
+      base::BindOnce(
+          &WriteDataChunkIntoSnapshotFileOnBlockingPoolThread,
+          current_snapshot_details_->file_info(),
+          Microsoft::WRL::ComPtr<IStream>(
+              current_snapshot_details_->device_file_stream()),
+          current_snapshot_details_->request_info().snapshot_file_path,
+          current_snapshot_details_->optimal_transfer_size()),
       base::BindOnce(
           &MTPDeviceDelegateImplWin::OnWroteDataChunkIntoSnapshotFile,
           weak_ptr_factory_.GetWeakPtr(),
@@ -586,7 +592,7 @@ void MTPDeviceDelegateImplWin::OnInitCompleted(bool succeeded) {
 
 void MTPDeviceDelegateImplWin::OnGetFileInfo(
     GetFileInfoSuccessCallback success_callback,
-    const ErrorCallback& error_callback,
+    ErrorCallback error_callback,
     base::File::Info* file_info,
     base::File::Error error) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
@@ -594,14 +600,14 @@ void MTPDeviceDelegateImplWin::OnGetFileInfo(
   if (error == base::File::FILE_OK)
     std::move(success_callback).Run(*file_info);
   else
-    error_callback.Run(error);
+    std::move(error_callback).Run(error);
   task_in_progress_ = false;
   ProcessNextPendingRequest();
 }
 
 void MTPDeviceDelegateImplWin::OnDidReadDirectory(
     const ReadDirectorySuccessCallback& success_callback,
-    const ErrorCallback& error_callback,
+    ErrorCallback error_callback,
     storage::AsyncFileUtil::EntryList* file_list,
     base::File::Error error) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
@@ -609,7 +615,7 @@ void MTPDeviceDelegateImplWin::OnDidReadDirectory(
   if (error == base::File::FILE_OK)
     success_callback.Run(*file_list, false /*no more entries*/);
   else
-    error_callback.Run(error);
+    std::move(error_callback).Run(error);
   task_in_progress_ = false;
   ProcessNextPendingRequest();
 }
@@ -623,7 +629,7 @@ void MTPDeviceDelegateImplWin::OnGetFileStream(
   DCHECK(!file_details->request_info().snapshot_file_path.empty());
   DCHECK(!current_snapshot_details_.get());
   if (error != base::File::FILE_OK) {
-    file_details->request_info().error_callback.Run(error);
+    std::move(file_details->error_callback()).Run(error);
     task_in_progress_ = false;
     ProcessNextPendingRequest();
     return;
@@ -670,8 +676,8 @@ void MTPDeviceDelegateImplWin::OnWroteDataChunkIntoSnapshotFile(
         current_snapshot_details_->file_info(),
         current_snapshot_details_->request_info().snapshot_file_path);
   } else {
-    current_snapshot_details_->request_info().error_callback.Run(
-        base::File::FILE_ERROR_FAILED);
+    std::move(current_snapshot_details_->error_callback())
+        .Run(base::File::FILE_ERROR_FAILED);
   }
   task_in_progress_ = false;
   current_snapshot_details_.reset();

chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h

@@ -96,29 +96,27 @@ class MTPDeviceDelegateImplWin : public MTPDeviceAsyncDelegate {
   // MTPDeviceAsyncDelegate:
   void GetFileInfo(const base::FilePath& file_path,
                    GetFileInfoSuccessCallback success_callback,
-                   const ErrorCallback& error_callback) override;
-  void CreateDirectory(
-      const base::FilePath& directory_path,
-      const bool exclusive,
-      const bool recursive,
-      const CreateDirectorySuccessCallback& success_callback,
-      const ErrorCallback& error_callback) override;
-  void ReadDirectory(
-      const base::FilePath& root,
-      const ReadDirectorySuccessCallback& success_callback,
-      const ErrorCallback& error_callback) override;
+                   ErrorCallback error_callback) override;
+  void CreateDirectory(const base::FilePath& directory_path,
+                       const bool exclusive,
+                       const bool recursive,
+                       const CreateDirectorySuccessCallback& success_callback,
+                       ErrorCallback error_callback) override;
+  void ReadDirectory(const base::FilePath& root,
+                     const ReadDirectorySuccessCallback& success_callback,
+                     ErrorCallback error_callback) override;
   void CreateSnapshotFile(
       const base::FilePath& device_file_path,
       const base::FilePath& local_path,
       const CreateSnapshotFileSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) override;
+      ErrorCallback error_callback) override;
   bool IsStreaming() override;
   void ReadBytes(const base::FilePath& device_file_path,
                  const scoped_refptr<net::IOBuffer>& buf,
                  int64_t offset,
                  int buf_len,
                  ReadBytesSuccessCallback success_callback,
-                 const ErrorCallback& error_callback) override;
+                 ErrorCallback error_callback) override;
   bool IsReadOnly() const override;
   void CopyFileLocal(
       const base::FilePath& source_file_path,
@@ -126,24 +124,24 @@ class MTPDeviceDelegateImplWin : public MTPDeviceAsyncDelegate {
       const CreateTemporaryFileCallback& create_temporary_file_callback,
       const CopyFileProgressCallback& progress_callback,
       const CopyFileLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) override;
+      ErrorCallback error_callback) override;
   void MoveFileLocal(
       const base::FilePath& source_file_path,
       const base::FilePath& device_file_path,
       const CreateTemporaryFileCallback& create_temporary_file_callback,
       const MoveFileLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) override;
+      ErrorCallback error_callback) override;
   void CopyFileFromLocal(
       const base::FilePath& source_file_path,
       const base::FilePath& device_file_path,
       const CopyFileFromLocalSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) override;
+      ErrorCallback error_callback) override;
   void DeleteFile(const base::FilePath& file_path,
                   const DeleteFileSuccessCallback& success_callback,
-                  const ErrorCallback& error_callback) override;
+                  ErrorCallback error_callback) override;
   void DeleteDirectory(const base::FilePath& file_path,
                        const DeleteDirectorySuccessCallback& success_callback,
-                       const ErrorCallback& error_callback) override;
+                       ErrorCallback error_callback) override;
   void AddWatcher(const GURL& origin,
                   const base::FilePath& file_path,
                   const bool recursive,
@@ -190,7 +188,7 @@ class MTPDeviceDelegateImplWin : public MTPDeviceAsyncDelegate {
   // If the GetFileInfo() fails, |file_info| is not set and |error_callback| is
   // invoked to notify the caller about the platform file |error|.
   void OnGetFileInfo(GetFileInfoSuccessCallback success_callback,
-                     const ErrorCallback& error_callback,
+                     ErrorCallback error_callback,
                      base::File::Info* file_info,
                      base::File::Error error);
 
@@ -203,7 +201,7 @@ class MTPDeviceDelegateImplWin : public MTPDeviceAsyncDelegate {
   // If the ReadDirectory() fails, |file_list| is not set and |error_callback|
   // is invoked to notify the caller about the platform file |error|.
   void OnDidReadDirectory(const ReadDirectorySuccessCallback& success_callback,
-                          const ErrorCallback& error_callback,
+                          ErrorCallback error_callback,
                           storage::AsyncFileUtil::EntryList* file_list,
                           base::File::Error error);
 

chrome/browser/media_galleries/win/snapshot_file_details.cc

@@ -17,32 +17,24 @@ SnapshotRequestInfo::SnapshotRequestInfo(
     const base::FilePath& snapshot_file_path,
     const MTPDeviceAsyncDelegate::CreateSnapshotFileSuccessCallback&
         success_callback,
-    const MTPDeviceAsyncDelegate::ErrorCallback& error_callback)
+    MTPDeviceAsyncDelegate::ErrorCallback error_callback)
     : device_file_path(device_file_path),
       snapshot_file_path(snapshot_file_path),
       success_callback(success_callback),
-      error_callback(error_callback) {
-}
+      error_callback(std::move(error_callback)) {}
 
-SnapshotRequestInfo::SnapshotRequestInfo(const SnapshotRequestInfo& other) =
-    default;
+SnapshotRequestInfo::SnapshotRequestInfo(SnapshotRequestInfo&& other) = default;
 
-SnapshotRequestInfo::~SnapshotRequestInfo() {
-}
+SnapshotRequestInfo::~SnapshotRequestInfo() = default;
 
 ///////////////////////////////////////////////////////////////////////////////
 //                       SnapshotFileDetails                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
-SnapshotFileDetails::SnapshotFileDetails(
-    const SnapshotRequestInfo& request_info)
-    : request_info_(request_info),
+SnapshotFileDetails::SnapshotFileDetails(SnapshotRequestInfo request_info)
+    : request_info_(std::move(request_info)),
       optimal_transfer_size_(0),
-      bytes_written_(0) {
-}
-
-SnapshotFileDetails::SnapshotFileDetails(const SnapshotFileDetails& other) =
-    default;
+      bytes_written_(0) {}
 
 SnapshotFileDetails::~SnapshotFileDetails() {
   file_stream_.Reset();

chrome/browser/media_galleries/win/snapshot_file_details.h

@@ -18,8 +18,10 @@ struct SnapshotRequestInfo {
       const base::FilePath& snapshot_file_path,
       const MTPDeviceAsyncDelegate::CreateSnapshotFileSuccessCallback&
           success_callback,
-      const MTPDeviceAsyncDelegate::ErrorCallback& error_callback);
-  SnapshotRequestInfo(const SnapshotRequestInfo& other);
+      MTPDeviceAsyncDelegate::ErrorCallback error_callback);
+  SnapshotRequestInfo(SnapshotRequestInfo&& other);
+  SnapshotRequestInfo(const SnapshotRequestInfo& other) = delete;
+  SnapshotRequestInfo& operator=(const SnapshotRequestInfo& other) = delete;
   ~SnapshotRequestInfo();
 
   // Device file path.
@@ -39,16 +41,17 @@ struct SnapshotRequestInfo {
 // Provides the details for the the creation of snapshot file.
 class SnapshotFileDetails {
  public:
-  explicit SnapshotFileDetails(const SnapshotRequestInfo& request_info);
-  SnapshotFileDetails(const SnapshotFileDetails& other);
+  explicit SnapshotFileDetails(SnapshotRequestInfo request_info);
   ~SnapshotFileDetails();
 
   void set_file_info(const base::File::Info& file_info);
   void set_device_file_stream(IStream* file_stream);
   void set_optimal_transfer_size(DWORD optimal_transfer_size);
 
-  SnapshotRequestInfo request_info() const {
-    return request_info_;
+  const SnapshotRequestInfo& request_info() const { return request_info_; }
+
+  MTPDeviceAsyncDelegate::ErrorCallback error_callback() {
+    return std::move(request_info_.error_callback);
   }
 
   base::File::Info file_info() const {