Isolated FS for media devices.

base/system_monitor/system_monitor.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 "base/system_monitor/system_monitor.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 86 matching lines @@
     // This can happen if our unique id scheme fails. Ignore the incoming
     // non-unique attachment.
     return;
   }
   media_device_map_.insert(std::make_pair(id, info));
   NotifyMediaDeviceAttached(id, name, type, location);
 }
 
 void SystemMonitor::ProcessMediaDeviceDetached(const std::string& id) {
   MediaDeviceMap::iterator it = media_device_map_.find(id);
-  if (it != media_device_map_.end())
-    media_device_map_.erase(it);
-  NotifyMediaDeviceDetached(id);
+  if (it == media_device_map_.end())
+    return;
+
+  NotifyMediaDeviceDetached(id, it->second.location);
+  media_device_map_.erase(it);
 }
 
 std::vector<SystemMonitor::MediaDeviceInfo>
 SystemMonitor::GetAttachedMediaDevices() const {
   std::vector<MediaDeviceInfo> results;
   for (MediaDeviceMap::const_iterator it = media_device_map_.begin();
        it != media_device_map_.end();
        ++it) {
     results.push_back(it->second);
   }
@@ skipping 26 matching lines @@
     const std::string& id,
     const string16& name,
     MediaDeviceType type,
     const FilePath::StringType& location) {
   DVLOG(1) << "MediaDeviceAttached with name " << UTF16ToUTF8(name)
            << " and id " << id;
   devices_changed_observer_list_->Notify(
     &DevicesChangedObserver::OnMediaDeviceAttached, id, name, type, location);
 }
 
-void SystemMonitor::NotifyMediaDeviceDetached(const std::string& id) {
+void SystemMonitor::NotifyMediaDeviceDetached(
+    const std::string& id,
+    const FilePath::StringType& location) {
   DVLOG(1) << "MediaDeviceDetached for id " << id;
   devices_changed_observer_list_->Notify(
-    &DevicesChangedObserver::OnMediaDeviceDetached, id);
+    &DevicesChangedObserver::OnMediaDeviceDetached, id, location);
 }
 
 void SystemMonitor::NotifyPowerStateChange() {
   DVLOG(1) << "PowerStateChange: " << (BatteryPower() ? "On" : "Off")
            << " battery";
   power_observer_list_->Notify(&PowerObserver::OnPowerStateChange,
                                BatteryPower());
 }
 
 void SystemMonitor::NotifySuspend() {
   DVLOG(1) << "Power Suspending";
   power_observer_list_->Notify(&PowerObserver::OnSuspend);
 }
 
 void SystemMonitor::NotifyResume() {
   DVLOG(1) << "Power Resuming";
   power_observer_list_->Notify(&PowerObserver::OnResume);
 }
 
 void SystemMonitor::BatteryCheck() {
   ProcessPowerMessage(SystemMonitor::POWER_STATE_EVENT);
 }
 
 }  // namespace base