Change base::SystemMonitor's media device functions to take a type and string16 instead of a FilePa…

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/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "base/stl_util.h"
 #include "base/time.h"
+#include "base/utf_string_conversions.h"
 
 namespace base {
 
 static SystemMonitor* g_system_monitor = NULL;
 
 #if defined(ENABLE_BATTERY_MONITORING)
 // The amount of time (in ms) to wait before running the initial
 // battery check.
 static int kDelayedBatteryCheckMs = 10 * 1000;
 #endif  // defined(ENABLE_BATTERY_MONITORING)
@@ skipping 56 matching lines @@
         NotifySuspend();
       }
       break;
   }
 }
 
 void SystemMonitor::ProcessDevicesChanged() {
   NotifyDevicesChanged();
 }
 
-void SystemMonitor::ProcessMediaDeviceAttached(const DeviceIdType& id,
-                                               const std::string& name,
-                                               const FilePath& path) {
-  media_device_map_.insert(std::make_pair(id, MakeTuple(id, name, path)));
-  NotifyMediaDeviceAttached(id, name, path);
+void SystemMonitor::ProcessMediaDeviceAttached(
+    const std::string& id,
+    const string16& name,
+    MediaDeviceType type,
+    const FilePath::StringType& location) {
+  MediaDeviceInfo info(id, name, type, location);
+  if (ContainsKey(media_device_map_, id)) {
+    // 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 DeviceIdType& id) {
+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);
 }
 
 std::vector<SystemMonitor::MediaDeviceInfo>
 SystemMonitor::GetAttachedMediaDevices() const {
   std::vector<MediaDeviceInfo> results;
   for (MediaDeviceMap::const_iterator it = media_device_map_.begin();
@@ skipping 19 matching lines @@
 void SystemMonitor::RemoveDevicesChangedObserver(DevicesChangedObserver* obs) {
   devices_changed_observer_list_->RemoveObserver(obs);
 }
 
 void SystemMonitor::NotifyDevicesChanged() {
   DVLOG(1) << "DevicesChanged";
   devices_changed_observer_list_->Notify(
     &DevicesChangedObserver::OnDevicesChanged);
 }
 
-void SystemMonitor::NotifyMediaDeviceAttached(const DeviceIdType& id,
-                                              const std::string& name,
-                                              const FilePath& path) {
-  DVLOG(1) << "MediaDeviceAttached with name " << name << " and id " << id;
+void SystemMonitor::NotifyMediaDeviceAttached(
+    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, path);
+    &DevicesChangedObserver::OnMediaDeviceAttached, id, name, type, location);
 }
 
-void SystemMonitor::NotifyMediaDeviceDetached(const DeviceIdType& id) {
+void SystemMonitor::NotifyMediaDeviceDetached(const std::string& id) {
   DVLOG(1) << "MediaDeviceDetached for id " << id;
   devices_changed_observer_list_->Notify(
     &DevicesChangedObserver::OnMediaDeviceDetached, id);
 }
 
 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