SystemMonitor: Pull device type into the device id

chrome/browser/media_gallery/media_device_notifications_linux.h

Index: chrome/browser/media_gallery/media_device_notifications_linux.h
diff --git a/chrome/browser/media_gallery/media_device_notifications_linux.h b/chrome/browser/media_gallery/media_device_notifications_linux.h
index 079123c16fcb85065b4e78d3d636e48a97d8e0dd..ac8f671918c5f24081e3aa327ddbf3c9d351fe32 100644
--- a/chrome/browser/media_gallery/media_device_notifications_linux.h
+++ b/chrome/browser/media_gallery/media_device_notifications_linux.h
@@ -26,10 +26,10 @@
 class FilePath;
 
 // Gets the media device information given a |device_path|. On success,
-// returns true and fills in |device_name| and |device_id|.
+// returns true and fills in |device_name| and |unique_id|.

[kmadhusu, 2012/08/20 17:13:50]

Rename |id| => |unique_id| to match the comments.

 typedef bool (*GetDeviceInfoFunc)(const std::string& device_path,
-                                  std::string* device_name,
-                                  string16* device_id);
+                                  std::string* id,
+                                  string16* name);
 
 namespace chrome {