Implement DeleteFile and DeleteDirectory.

device/media_transfer_protocol/media_transfer_protocol_manager.cc

 // 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.
 
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <queue>
 #include <set>
@@ skipping 154 matching lines @@
                      const ReadDirectoryCallback& callback) override {
     DCHECK(thread_checker_.CalledOnValidThread());
     if (!ContainsKey(handles_, storage_handle) || !mtp_client_) {
       callback.Run(std::vector<MtpFileEntry>(),
                    false /* no more entries */,
                    true /* error */);
       return;
     }
     read_directory_callbacks_.push(callback);
     mtp_client_->ReadDirectoryEntryIds(
-        storage_handle,
-        file_id,
-        base::Bind(&MediaTransferProtocolManagerImpl::OnReadDirectoryEntryIds,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   storage_handle),
+        storage_handle, file_id,
+        base::Bind(&MediaTransferProtocolManagerImpl::
+                       OnReadDirectoryEntryIdsToReadDirectory,
+                   weak_ptr_factory_.GetWeakPtr(), storage_handle),
         base::Bind(&MediaTransferProtocolManagerImpl::OnReadDirectoryError,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
+  void ReadDirectoryEntryIds(
+      const std::string& storage_handle,
+      const uint32 file_id,
+      const ReadDirectoryEntryIdsCallback& callback) override {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    if (!ContainsKey(handles_, storage_handle) || !mtp_client_) {
+      callback.Run(std::vector<uint32>(), true /* error */);
+      return;
+    }
+    read_directory_entry_ids_callbacks_.push(callback);
+    mtp_client_->ReadDirectoryEntryIds(
+        storage_handle, file_id,
+        base::Bind(&MediaTransferProtocolManagerImpl::OnReadDirectoryEntryIds,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(
+            &MediaTransferProtocolManagerImpl::OnReadDirectoryEntryIdsError,
+            weak_ptr_factory_.GetWeakPtr()));
+  }
+
   // MediaTransferProtocolManager override.
   void ReadFileChunk(const std::string& storage_handle,
                      uint32 file_id,
                      uint32 offset,
                      uint32 count,
                      const ReadFileCallback& callback) override {
     DCHECK(thread_checker_.CalledOnValidThread());
     if (!ContainsKey(handles_, storage_handle) || !mtp_client_) {
       callback.Run(std::string(), true);
       return;
@@ skipping 41 matching lines @@
     }
     copy_file_from_local_callbacks_.push(callback);
     mtp_client_->CopyFileFromLocal(
         storage_handle, source_file_descriptor, parent_id, file_name,
         base::Bind(&MediaTransferProtocolManagerImpl::OnCopyFileFromLocal,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&MediaTransferProtocolManagerImpl::OnCopyFileFromLocalError,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
+  void DeleteObject(const std::string& storage_handle,
+                    const uint32 object_id,
+                    const DeleteObjectCallback& callback) override {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    if (!ContainsKey(handles_, storage_handle) || !mtp_client_) {
+      callback.Run(true /* error */);
+      return;
+    }
+    delete_object_callbacks_.push(callback);
+    mtp_client_->DeleteObject(
+        storage_handle, object_id,
+        base::Bind(&MediaTransferProtocolManagerImpl::OnDeleteObject,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&MediaTransferProtocolManagerImpl::OnDeleteObjectError,
+                   weak_ptr_factory_.GetWeakPtr()));
+  }
+
  private:
   // Map of storage names to storage info.
   typedef std::map<std::string, MtpStorageInfo> StorageInfoMap;
   // Callback queues - DBus communication is in-order, thus callbacks are
   // received in the same order as the requests.
   typedef std::queue<OpenStorageCallback> OpenStorageCallbackQueue;
   // (callback, handle)
   typedef std::queue<std::pair<CloseStorageCallback, std::string>
                     > CloseStorageCallbackQueue;
   typedef std::queue<ReadDirectoryCallback> ReadDirectoryCallbackQueue;
+  typedef std::queue<ReadDirectoryEntryIdsCallback>
+      ReadDirectoryEntryIdsCallbackQueue;
   typedef std::queue<ReadFileCallback> ReadFileCallbackQueue;
   typedef std::queue<GetFileInfoCallback> GetFileInfoCallbackQueue;
   typedef std::queue<CopyFileFromLocalCallback> CopyFileFromLocalCallbackQueue;
+  typedef std::queue<DeleteObjectCallback> DeleteObjectCallbackQueue;
 
   void OnStorageAttached(const std::string& storage_name) {
     DCHECK(thread_checker_.CalledOnValidThread());
     mtp_client_->GetStorageInfo(
         storage_name,
         base::Bind(&MediaTransferProtocolManagerImpl::OnGetStorageInfo,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&base::DoNothing));
   }
 
@@ skipping 82 matching lines @@
     }
     close_storage_callbacks_.pop();
   }
 
   void OnCloseStorageError() {
     DCHECK(thread_checker_.CalledOnValidThread());
     close_storage_callbacks_.front().first.Run(true);
     close_storage_callbacks_.pop();
   }
 
-  void OnReadDirectoryEntryIds(const std::string& storage_handle,
-                               const std::vector<uint32>& file_ids) {
+  void OnReadDirectoryEntryIdsToReadDirectory(
+      const std::string& storage_handle,
+      const std::vector<uint32>& file_ids) {
     DCHECK(thread_checker_.CalledOnValidThread());
 
     if (file_ids.empty()) {
       OnGotDirectoryEntries(storage_handle,
                             file_ids,
                             kInitialOffset,
                             file_ids,
                             std::vector<MtpFileEntry>());
       return;
     }
@@ skipping 64 matching lines @@
   }
 
   void OnReadDirectoryError() {
     DCHECK(thread_checker_.CalledOnValidThread());
     read_directory_callbacks_.front().Run(std::vector<MtpFileEntry>(),
                                           false /* no more entries */,
                                           true /* error */);
     read_directory_callbacks_.pop();
   }
 
+  void OnReadDirectoryEntryIds(const std::vector<uint32>& file_ids) {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    read_directory_entry_ids_callbacks_.front().Run(file_ids,
+                                                    false /* no error */);
+    read_directory_entry_ids_callbacks_.pop();
+  }
+
+  void OnReadDirectoryEntryIdsError() {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    read_directory_entry_ids_callbacks_.front().Run(std::vector<uint32>(),
+                                                    true /* error */);
+    read_directory_entry_ids_callbacks_.pop();
+  }
+
   void OnReadFile(const std::string& data) {
     DCHECK(thread_checker_.CalledOnValidThread());
     read_file_callbacks_.front().Run(data, false);
     read_file_callbacks_.pop();
   }
 
   void OnReadFileError() {
     DCHECK(thread_checker_.CalledOnValidThread());
     read_file_callbacks_.front().Run(std::string(), true);
     read_file_callbacks_.pop();
@@ skipping 20 matching lines @@
     copy_file_from_local_callbacks_.front().Run(false /* no error */);
     copy_file_from_local_callbacks_.pop();
   }
 
   void OnCopyFileFromLocalError() {
     DCHECK(thread_checker_.CalledOnValidThread());
     copy_file_from_local_callbacks_.front().Run(true /* error */);
     copy_file_from_local_callbacks_.pop();
   }
 
+  void OnDeleteObject() {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    delete_object_callbacks_.front().Run(false /* no error */);
+    delete_object_callbacks_.pop();
+  }
+
+  void OnDeleteObjectError() {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    delete_object_callbacks_.front().Run(true /* error */);
+    delete_object_callbacks_.pop();
+  }
+
   // Get the Bus object used to communicate with mtpd.
   dbus::Bus* GetBus() {
     DCHECK(thread_checker_.CalledOnValidThread());
 #if defined(OS_CHROMEOS)
     return chromeos::DBusThreadManager::Get()->GetSystemBus();
 #else
     return session_bus_.get();
 #endif
   }
 
@@ skipping 59 matching lines @@
   std::set<std::string> handles_;
 
   dbus::Bus::GetServiceOwnerCallback mtpd_owner_changed_callback_;
 
   std::string current_mtpd_owner_;
 
   // Queued callbacks.
   OpenStorageCallbackQueue open_storage_callbacks_;
   CloseStorageCallbackQueue close_storage_callbacks_;
   ReadDirectoryCallbackQueue read_directory_callbacks_;
+  ReadDirectoryEntryIdsCallbackQueue read_directory_entry_ids_callbacks_;
   ReadFileCallbackQueue read_file_callbacks_;
   GetFileInfoCallbackQueue get_file_info_callbacks_;
   CopyFileFromLocalCallbackQueue copy_file_from_local_callbacks_;
+  DeleteObjectCallbackQueue delete_object_callbacks_;
 
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<MediaTransferProtocolManagerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaTransferProtocolManagerImpl);
 };
 
 }  // namespace
 
 // static
 MediaTransferProtocolManager* MediaTransferProtocolManager::Initialize(
     scoped_refptr<base::SequencedTaskRunner> task_runner) {
   DCHECK(!g_media_transfer_protocol_manager);
 
   g_media_transfer_protocol_manager =
       new MediaTransferProtocolManagerImpl(task_runner);
   VLOG(1) << "MediaTransferProtocolManager initialized";
 
   return g_media_transfer_protocol_manager;
 }
 
 }  // namespace device