[StorageMonitor] Handle EjectDevice call for MTP devices

chrome/browser/storage_monitor/portable_device_watcher_win.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.
 //
 // Any tasks that communicates with the portable device may take >100ms to
 // complete. Those tasks should be run on an blocking thread instead of the
 // UI thread.
 
 #include "chrome/browser/storage_monitor/portable_device_watcher_win.h"
 
@@ skipping 537 matching lines @@
 }
 
 void PortableDeviceWatcherWin::SetNotifications(
     StorageMonitor::Receiver* notifications) {
   storage_notifications_ = notifications;
 }
 
 void PortableDeviceWatcherWin::EjectDevice(
     const std::string& device_id,
     base::Callback<void(StorageMonitor::EjectStatus)> callback) {
-  callback.Run(chrome::StorageMonitor::EJECT_FAILURE);
+  // MTP devices on Windows don't have a detach API needed -- signal
+  // the object as if the device is gone and tell the caller it is OK
+  // to remove.
+  string16 device_location;      // The device_map_ key.
+  string16 storage_object_id;
+  if (!GetMTPStorageInfoFromDeviceId(device_id,
+                                     &device_location, &storage_object_id)) {
+    callback.Run(chrome::StorageMonitor::EJECT_NO_SUCH_DEVICE);
+    return;
+  }
+  HandleDeviceDetachEvent(device_location);
+
+  callback.Run(chrome::StorageMonitor::EJECT_OK);
 }
 
 void PortableDeviceWatcherWin::EnumerateAttachedDevices() {
   DCHECK(media_task_runner_.get());
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   Devices* devices = new Devices;
   base::PostTaskAndReplyWithResult(
       media_task_runner_,
       FROM_HERE,
       base::Bind(&EnumerateAttachedDevicesOnBlockingThread, devices),
@@ skipping 47 matching lines @@
     // empty values.
     MediaStorageUtil::RecordDeviceInfoHistogram(false, storage_id, name);
     if (storage_id.empty() || name.empty())
       return;
 
     // Device can have several data partitions. Therefore, add the
     // partition identifier to the storage name. E.g.: "Nexus 7 (s10001)"
     string16 storage_name(name + L" (" + storage_iter->object_temporary_id +
         L')');
     StorageInfo info(storage_id, storage_name, location,
-                     string16(), string16(), string16(), 0);
+                     storage_name, string16(), string16(), 0);
     storage_map_[storage_id] = info;
     if (storage_notifications_) {
       info.set_location(GetStoragePathFromStorageId(storage_id));
       storage_notifications_->ProcessAttach(info);
     }
   }
   device_map_[location] = storage_objects;
 }
 
 void PortableDeviceWatcherWin::HandleDeviceDetachEvent(
@@ skipping 13 matching lines @@
     if (storage_notifications_) {
       storage_notifications_->ProcessDetach(
           storage_map_iter->second.device_id());
     }
     storage_map_.erase(storage_map_iter);
   }
   device_map_.erase(device_iter);
 }
 
 }  // namespace chrome