Refine StorageMonitor storage device getter

chrome/browser/media_galleries/media_file_system_registry.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.
 
 // MediaFileSystemRegistry implementation.
 
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 
 #include <set>
 #include <vector>
@@ skipping 447 matching lines @@
       MediaGalleriesPreferencesFactory::GetForProfile(profile);
   if (ContainsKey(extension_hosts_map_, profile))
     return preferences;
 
   // Create an empty entry so the initialization code below only gets called
   // once per profile.
   extension_hosts_map_[profile] = ExtensionHostMap();
 
   // TODO(gbillock): Move this stanza to MediaGalleriesPreferences init code.
   StorageMonitor* monitor = StorageMonitor::GetInstance();
-  std::vector<StorageInfo> existing_devices = monitor->GetAttachedStorage();
+  std::vector<StorageInfo> existing_devices =
+      monitor->GetAllAvailableStorages();
   for (size_t i = 0; i < existing_devices.size(); i++) {
-    if (!StorageInfo::IsMediaDevice(existing_devices[i].device_id()))
+    if (!(StorageInfo::IsMediaDevice(existing_devices[i].device_id()) &&
+          StorageInfo::IsRemovableDevice(existing_devices[i].device_id())))
       continue;
     if (!existing_devices[i].name().empty()) {
       preferences->AddGalleryWithName(existing_devices[i].device_id(),
                                       existing_devices[i].name(),
                                       base::FilePath(),
                                       false /*not user added*/);
     } else {
       preferences->AddGallery(existing_devices[i].device_id(),
                               base::FilePath(),
                               false,
@@ skipping 224 matching lines @@
     // previously used.
     PrefChangeRegistrarMap::iterator pref_it =
         pref_change_registrar_map_.find(profile);
     DCHECK(pref_it != pref_change_registrar_map_.end());
     delete pref_it->second;
     pref_change_registrar_map_.erase(pref_it);
   }
 }
 
 }  // namespace chrome