Refine StorageMonitor storage device getter

chrome/browser/storage_monitor/media_storage_util.cc

Index: chrome/browser/storage_monitor/media_storage_util.cc
diff --git a/chrome/browser/storage_monitor/media_storage_util.cc b/chrome/browser/storage_monitor/media_storage_util.cc
index 04c342fb9c5930ab43a9809c95ab9ae11e9228c6..e5e0637f64586551ae557775b2df8729e043773b 100644
--- a/chrome/browser/storage_monitor/media_storage_util.cc
+++ b/chrome/browser/storage_monitor/media_storage_util.cc
@@ -50,10 +50,11 @@ void ValidatePathOnFileThread(
 typedef std::vector<StorageInfo> StorageInfoList;
 
 bool IsRemovableStorageAttached(const std::string& id) {
-  StorageInfoList devices = StorageMonitor::GetInstance()->GetAttachedStorage();
+  StorageInfoList devices =
+      StorageMonitor::GetInstance()->GetAllAvailableStorages();
   for (StorageInfoList::const_iterator it = devices.begin();
        it != devices.end(); ++it) {
-    if (it->device_id() == id)
+    if (it->device_id() == id && StorageInfo::IsRemovableDevice(id))

[Lei Zhang, 2013/06/06 10:15:09]

Since |id| is known already, you can check if it is not removable first, and
possibly immediately return false.

[Haojian Wu, 2013/06/06 11:24:02]

Done.

       return true;
   }
   return false;
@@ -61,10 +62,12 @@ bool IsRemovableStorageAttached(const std::string& id) {
 
 base::FilePath::StringType FindRemovableStorageLocationById(
     const std::string& device_id) {
-  StorageInfoList devices = StorageMonitor::GetInstance()->GetAttachedStorage();
+  StorageInfoList devices =
+      StorageMonitor::GetInstance()->GetAllAvailableStorages();
   for (StorageInfoList::const_iterator it = devices.begin();
        it != devices.end(); ++it) {
-    if (it->device_id() == device_id)
+    if (it->device_id() == device_id
+        && StorageInfo::IsRemovableDevice(device_id))
       return it->location();
   }
   return base::FilePath::StringType();