Refine StorageMonitor storage device getter

chrome/browser/storage_monitor/storage_monitor.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/storage_monitor.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/storage_monitor/removable_storage_observer.h"
 #include "chrome/browser/storage_monitor/transient_device_ids.h"
@@ skipping 31 matching lines @@
 }
 
 void StorageMonitor::ReceiverImpl::MarkInitialized() {
   notifications_->MarkInitialized();
 }
 
 StorageMonitor* StorageMonitor::GetInstance() {
   return g_storage_monitor;
 }
 
-std::vector<StorageInfo> StorageMonitor::GetAttachedStorage() const {
+std::vector<StorageInfo> StorageMonitor::GetAllAvailableStorages() const {
   std::vector<StorageInfo> results;
 
   base::AutoLock lock(storage_lock_);
-  for (RemovableStorageMap::const_iterator it = storage_map_.begin();
+  for (AllAvailableStorageMap::const_iterator it = storage_map_.begin();
        it != storage_map_.end();
        ++it) {
     results.push_back(it->second);
   }
   return results;
 }
 
 void StorageMonitor::Initialize(base::Closure callback) {
   if (initialized_) {
     if (!callback.is_null())
@@ skipping 78 matching lines @@
     if (ContainsKey(storage_map_, info.device_id())) {
       // This can happen if our unique id scheme fails. Ignore the incoming
       // non-unique attachment.
       return;
     }
     storage_map_.insert(std::make_pair(info.device_id(), info));
   }
 
   DVLOG(1) << "RemovableStorageAttached with name " << UTF16ToUTF8(info.name())
            << " and id " << info.device_id();
-  observer_list_->Notify(
-      &RemovableStorageObserver::OnRemovableStorageAttached, info);
+  if (StorageInfo::IsRemovableDevice(info.device_id()))
+    observer_list_->Notify(
+        &RemovableStorageObserver::OnRemovableStorageAttached, info);
 }
 
 void StorageMonitor::ProcessDetach(const std::string& id) {
   StorageInfo info;
   {
     base::AutoLock lock(storage_lock_);
-    RemovableStorageMap::iterator it = storage_map_.find(id);
+    AllAvailableStorageMap::iterator it = storage_map_.find(id);
     if (it == storage_map_.end())
       return;
     info = it->second;
     storage_map_.erase(it);
   }
 
   DVLOG(1) << "RemovableStorageDetached for id " << id;
   observer_list_->Notify(
       &RemovableStorageObserver::OnRemovableStorageDetached, info);
 }
 
 }  // namespace chrome