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/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 58 matching lines @@
       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);
+                                               MediaDeviceType type,
+                                               const string16& data) {
+  media_device_map_.insert(std::make_pair(id, MakeTuple(id, name, type, data)));
+  NotifyMediaDeviceAttached(id, name, type, data);
 }
 
+#if defined(OS_POSIX)
+void SystemMonitor::ProcessMediaDeviceAttached(const DeviceIdType& id,
+                                               const std::string& name,
+                                               MediaDeviceType type,
+                                               const std::string& data) {
+  string16 data16 = UTF8ToUTF16(data);
+  media_device_map_.insert(

[vandebo (ex-Chrome), 2012/07/19 19:05:20]

Call the other ProcessMediaDeviceAttach with the converted data instead so that
we don't have to update both of them when changes are made.

[Lei Zhang, 2012/07/19 23:07:25]

I removed this since we switched to FilePath::StringType.

+      std::make_pair(id, MakeTuple(id, name, type, data16)));
+  NotifyMediaDeviceAttached(id, name, type, data16);
+}
+#endif
+
 void SystemMonitor::ProcessMediaDeviceDetached(const DeviceIdType& 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;
@@ skipping 22 matching lines @@
 }
 
 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) {
+                                              MediaDeviceType type,
+                                              const string16& data) {
   DVLOG(1) << "MediaDeviceAttached with name " << name << " and id " << id;
   devices_changed_observer_list_->Notify(
-    &DevicesChangedObserver::OnMediaDeviceAttached, id, name, path);
+    &DevicesChangedObserver::OnMediaDeviceAttached, id, name, type, data);
 }
 
 void SystemMonitor::NotifyMediaDeviceDetached(const DeviceIdType& id) {
   DVLOG(1) << "MediaDeviceDetached for id " << id;
   devices_changed_observer_list_->Notify(
     &DevicesChangedObserver::OnMediaDeviceDetached, id);
 }
 
 void SystemMonitor::NotifyPowerStateChange() {
   DVLOG(1) << "PowerStateChange: " << (BatteryPower() ? "On" : "Off")
@@ skipping 10 matching lines @@
 void SystemMonitor::NotifyResume() {
   DVLOG(1) << "Power Resuming";
   power_observer_list_->Notify(&PowerObserver::OnResume);
 }
 
 void SystemMonitor::BatteryCheck() {
   ProcessPowerMessage(SystemMonitor::POWER_STATE_EVENT);
 }
 
 }  // namespace base