Implement DeleteFile and DeleteDirectory.

chrome/browser/media_galleries/linux/mtp_device_task_helper.cc

Index: chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
diff --git a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
index 5fb766fd2e92e0c7d40094f83ff9b2c2ae26e20c..c1f7a2b999ff6743e03a045e588aebf3c2c9833b 100644
--- a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
+++ b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
@@ -94,7 +94,8 @@ void MTPDeviceTaskHelper::GetFileInfo(
 }
 
 void MTPDeviceTaskHelper::ReadDirectory(
-    uint32 dir_id,
+    const uint32 directory_id,
+    const size_t max_size,
     const ReadDirectorySuccessCallback& success_callback,
     const ErrorCallback& error_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -102,10 +103,9 @@ void MTPDeviceTaskHelper::ReadDirectory(
     return HandleDeviceError(error_callback, base::File::FILE_ERROR_FAILED);
 
   GetMediaTransferProtocolManager()->ReadDirectory(
-      device_handle_, dir_id,
+      device_handle_, directory_id, max_size,
       base::Bind(&MTPDeviceTaskHelper::OnDidReadDirectory,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 success_callback,
+                 weak_ptr_factory_.GetWeakPtr(), success_callback,
                  error_callback));
 }
 
@@ -138,6 +138,7 @@ void MTPDeviceTaskHelper::ReadBytes(
                  weak_ptr_factory_.GetWeakPtr(), request));
 }
 
+// TODO(yawano) storage_name is not used, delete it.
 void MTPDeviceTaskHelper::CopyFileFromLocal(
     const std::string& storage_name,
     const int source_file_descriptor,
@@ -154,6 +155,19 @@ void MTPDeviceTaskHelper::CopyFileFromLocal(
                  error_callback));
 }
 
+void MTPDeviceTaskHelper::DeleteObject(
+    const uint32 object_id,
+    const DeleteObjectSuccessCallback& success_callback,
+    const ErrorCallback& error_callback) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  GetMediaTransferProtocolManager()->DeleteObject(
+      device_handle_, object_id,
+      base::Bind(&MTPDeviceTaskHelper::OnDeleteObject,
+                 weak_ptr_factory_.GetWeakPtr(), success_callback,
+                 error_callback));
+}
+
 void MTPDeviceTaskHelper::CloseStorage() const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (device_handle_.empty())
@@ -300,6 +314,22 @@ void MTPDeviceTaskHelper::OnCopyFileFromLocal(
                                    base::Bind(success_callback));
 }
 
+void MTPDeviceTaskHelper::OnDeleteObject(
+    const DeleteObjectSuccessCallback& success_callback,
+    const ErrorCallback& error_callback,
+    const bool error) const {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  if (error) {
+    content::BrowserThread::PostTask(
+        content::BrowserThread::IO, FROM_HERE,
+        base::Bind(error_callback, base::File::FILE_ERROR_FAILED));
+    return;
+  }
+
+  content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
+                                   base::Bind(success_callback));
+}
+
 void MTPDeviceTaskHelper::HandleDeviceError(
     const ErrorCallback& error_callback,
     base::File::Error error) const {