Refine StorageMonitor storage device getter

chrome/browser/storage_monitor/media_storage_util.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 "chrome/browser/storage_monitor/media_storage_util.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 32 matching lines @@
     const base::FilePath& path,
     const MediaStorageUtil::BoolCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, file_util::PathExists(path)));
 }
 
 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 (StorageInfo::IsRemovableDevice(id) && it->device_id() == id)
       return true;
   }
   return false;
 }
 
 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();
 }
 
 void FilterAttachedDevicesOnFileThread(MediaStorageUtil::DeviceIdSet* devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   MediaStorageUtil::DeviceIdSet missing_devices;
 
   for (MediaStorageUtil::DeviceIdSet::const_iterator it = devices->begin();
@@ skipping 165 matching lines @@
       static_cast<enum DeviceInfoHistogramBuckets>(event_number);
   if (event >= DEVICE_INFO_BUCKET_BOUNDARY) {
     NOTREACHED();
     return;
   }
   UMA_HISTOGRAM_ENUMERATION("MediaDeviceNotifications.DeviceInfo", event,
                             DEVICE_INFO_BUCKET_BOUNDARY);
 }
 
 }  // namespace chrome