Fix error handling of CopyFileFromLocal and remove unnecessary PendingRequestDone.

chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h

Index: chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h
diff --git a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h
index 016993a0f656b372e2ad9ee53171a5c6ef048bb3..563046b5a35c037c4f4aaf8f83fca6f88a7467a4 100644
--- a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h
+++ b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h
@@ -148,11 +148,11 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
       const MoveFileLocalSuccessCallback& success_callback,
       const ErrorCallback& error_callback,
       const base::File::Info& source_file_info);
-  virtual void CopyFileFromLocalInternal(
+  virtual void OnDidOpenFDToCopyFileFromLocal(
       const base::FilePath& device_file_path,
       const CopyFileFromLocalSuccessCallback& success_callback,
       const ErrorCallback& error_callback,
-      const int source_file_descriptor);
+      const std::pair<int, int>& open_fd_result);
   virtual void DeleteFileInternal(
       const base::FilePath& file_path,
       const DeleteFileSuccessCallback& success_callback,
@@ -242,6 +242,18 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
       scoped_ptr<SnapshotRequestInfo> snapshot_request_info,
       const base::File::Info& file_info);
 
+  // Called when GetFileInfo() succeeded to copy file from local.
+  void OnDidGetFileInfoToCopyFileFromLocal(const ErrorCallback& error_callback,
+                                           const base::File::Info& file_info);
+
+  // Called when GetFileInfo() failed to copy file from local.
+  void OnGetFileInfoErrorToCopyFileFromLocal(
+      const base::FilePath& source_file_path,
+      const base::FilePath& device_file_path,
+      const CopyFileFromLocalSuccessCallback& success_callback,
+      const ErrorCallback& error_callback,
+      const base::File::Error error);
+
   // Called when ReadDirectory() succeeds.
   //
   // |dir_id| is the directory read.