Fix a potential multi-thread issue when manipulating removable storage map

base/system_monitor/system_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 "base/system_monitor/system_monitor.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 85 matching lines @@
 }
 
 void SystemMonitor::ProcessDevicesChanged(DeviceType device_type) {
   NotifyDevicesChanged(device_type);
 }
 
 void SystemMonitor::ProcessRemovableStorageAttached(
     const std::string& id,
     const string16& name,
     const FilePath::StringType& location) {
-  if (ContainsKey(removable_storage_map_, id)) {
-    // This can happen if our unique id scheme fails. Ignore the incoming
-    // non-unique attachment.
-    return;
+  {
+    base::AutoLock lock(removable_storage_lock_);
+    if (ContainsKey(removable_storage_map_, id)) {
+      // This can happen if our unique id scheme fails. Ignore the incoming
+      // non-unique attachment.
+      return;
+    }
+    RemovableStorageInfo info(id, name, location);
+    removable_storage_map_.insert(std::make_pair(id, info));
   }
-  RemovableStorageInfo info(id, name, location);
-  removable_storage_map_.insert(std::make_pair(id, info));
   NotifyRemovableStorageAttached(id, name, location);
 }
 
 void SystemMonitor::ProcessRemovableStorageDetached(const std::string& id) {
-  RemovableStorageMap::iterator it = removable_storage_map_.find(id);
-  if (it == removable_storage_map_.end())
-    return;
-  removable_storage_map_.erase(it);
+  {
+    base::AutoLock lock(removable_storage_lock_);
+    RemovableStorageMap::iterator it = removable_storage_map_.find(id);
+    if (it == removable_storage_map_.end())
+      return;
+    removable_storage_map_.erase(it);
+  }
   NotifyRemovableStorageDetached(id);
 }
 
 std::vector<SystemMonitor::RemovableStorageInfo>
-SystemMonitor::GetAttachedRemovableStorage() const {
+SystemMonitor::GetAttachedRemovableStorage() {
   std::vector<RemovableStorageInfo> results;
+
+  base::AutoLock lock(removable_storage_lock_);
   for (RemovableStorageMap::const_iterator it = removable_storage_map_.begin();
        it != removable_storage_map_.end();
        ++it) {
     results.push_back(it->second);
   }
   return results;
 }
 
 void SystemMonitor::AddPowerObserver(PowerObserver* obs) {
   power_observer_list_->AddObserver(obs);
@@ skipping 48 matching lines @@
 void SystemMonitor::NotifyResume() {
   DVLOG(1) << "Power Resuming";
   power_observer_list_->Notify(&PowerObserver::OnResume);
 }
 
 void SystemMonitor::BatteryCheck() {
   ProcessPowerMessage(SystemMonitor::POWER_STATE_EVENT);
 }
 
 }  // namespace base