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

chrome/browser/media_gallery/media_device_notifications_chromeos.h

Index: chrome/browser/media_gallery/media_device_notifications_chromeos.h
===================================================================
--- chrome/browser/media_gallery/media_device_notifications_chromeos.h	(revision 147551)
+++ chrome/browser/media_gallery/media_device_notifications_chromeos.h	(working copy)
@@ -42,7 +42,7 @@
   friend class base::RefCountedThreadSafe<MediaDeviceNotifications>;
 
   // Mapping of mount points to mount device IDs.
-  typedef std::map<std::string, base::SystemMonitor::DeviceIdType> MountMap;
+  typedef std::map<std::string, std::string> MountMap;
 
   // Private to avoid code deleting the object.
   virtual ~MediaDeviceNotifications();
@@ -59,7 +59,8 @@
 
   // The lowest available device id number.
   // Only accessed on the UI thread.
-  base::SystemMonitor::DeviceIdType current_device_id_;
+  // TODO(thestig) Remove this and use a device UUID instead.
+  int current_device_id_;
 
   // Mapping of relevant mount points and their corresponding mount devices.
   // Only accessed on the UI thread.