Make the Linux System Monitor implementation track all devices

chrome/browser/media_gallery/media_storage_util.cc

Index: chrome/browser/media_gallery/media_storage_util.cc
diff --git a/chrome/browser/media_gallery/media_storage_util.cc b/chrome/browser/media_gallery/media_storage_util.cc
index a019656b22c372b7055604624152055c22204fb7..b76546b8a9510a5d3826e28069f5c4328e7f32ca 100644
--- a/chrome/browser/media_gallery/media_storage_util.cc
+++ b/chrome/browser/media_gallery/media_storage_util.cc
@@ -156,7 +156,7 @@ void MediaStorageUtil::IsDeviceAttached(const std::string& device_id,
       callback.Run(!FindRemovableStorageLocationById(device_id).empty());
       break;
     case USB_MASS_STORAGE_NO_DCIM:
-      FindUSBDeviceById(unique_id,
+      FindUSBDeviceById(device_id,
                         base::Bind(&EmptyPathIsFalseCallback, callback));
       break;
     case OTHER_MASS_STORAGE:
@@ -202,7 +202,7 @@ void MediaStorageUtil::FindDevicePathById(const std::string& device_id,
       callback.Run(FilePath());
       break;
     case USB_MASS_STORAGE_NO_DCIM:
-      FindUSBDeviceById(unique_id, callback);
+      FindUSBDeviceById(device_id, callback);
       break;
     case OTHER_MASS_STORAGE:
       // For this type, the unique_id is the path.
@@ -222,7 +222,7 @@ void MediaStorageUtil::FindDevicePathById(const std::string& device_id,
 MediaStorageUtil::MediaStorageUtil() {}
 
 // static
-void MediaStorageUtil::FindUSBDeviceById(const std::string& unique_id,
+void MediaStorageUtil::FindUSBDeviceById(const std::string& device_id,
                                          const FilePathCallback& callback) {
   // TODO(vandebo) This needs to be implemented per platform.
   // Type is USB_MASS_STORAGE_NO_DCIM, so it's a device possibly mounted