Fix error handling of CopyFileFromLocal and remove unnecessary PendingRequestDone.

chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_DELEGATE_IMPL_LINUX_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_DELEGATE_IMPL_LINUX_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 130 matching lines @@
       net::IOBuffer* buf, int64 offset, int buf_len,
       const ReadBytesSuccessCallback& success_callback,
       const ErrorCallback& error_callback);
   virtual void MoveFileLocalInternal(
       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,
       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,
       const ErrorCallback& error_callback,
       const base::File::Info& file_info);
   virtual void DeleteDirectoryInternal(
       const base::FilePath& file_path,
       const DeleteDirectorySuccessCallback& success_callback,
       const ErrorCallback& error_callback,
       const base::File::Info& file_info);
@@ skipping 69 matching lines @@
   // Called when GetFileInfo() succeeds. GetFileInfo() is invoked to
   // create the snapshot file of |snapshot_request_info.device_file_path|.
   // |file_info| specifies the device file metadata details.
   //
   // Posts a task on the UI thread to copy the data contents of the device file
   // to the snapshot file.
   void OnDidGetFileInfoToCreateSnapshotFile(
       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.
   // |success_callback| is invoked to notify the caller about the directory
   // file entries.
   // |file_list| contains the directory file entries with their file ids.
   // |has_more| is true if there are more file entries to read.
   void OnDidReadDirectory(uint32 dir_id,
                           const ReadDirectorySuccessCallback& success_callback,
                           const storage::AsyncFileUtil::EntryList& file_list,
@@ skipping 153 matching lines @@
   // the ReadDirectory operation.
   FileInfoCache file_info_cache_;
 
   // For callbacks that may run after destruction.
   base::WeakPtrFactory<MTPDeviceDelegateImplLinux> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MTPDeviceDelegateImplLinux);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_DELEGATE_IMPL_LINUX_H_