Retry 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly."

chrome/browser/chromeos/disks/disk_mount_manager.cc

 // Copyright (c) 2011 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/chromeos/disks/disk_mount_manager.h"
 
 #include <map>
 #include <set>
 
 #include <sys/statvfs.h>
@@ skipping 394 matching lines @@
         NotifyDiskStatusUpdate(MOUNT_DISK_REMOVED, disk);
         delete iter->second;
         disks_.erase(iter++);
       } else {
         ++iter;
       }
     }
   }
 
   // Callback to handle mount event signals.
-  void OnMountEvent(MountEventType event, std::string device_path) {
+  void OnMountEvent(MountEventType event, const std::string& device_path_arg) {
+    // Take a copy of the argument so we can modify it below.
+    std::string device_path = device_path_arg;
     DiskMountManagerEventType type = MOUNT_DEVICE_ADDED;
     switch (event) {
       case DISK_ADDED: {
         cros_disks_client_->GetDeviceProperties(
             device_path,
             base::Bind(&DiskMountManagerImpl::OnGetDeviceProperties,
                        weak_ptr_factory_.GetWeakPtr()),
             base::Bind(&DoNothing));
         return;
       }
@@ skipping 238 matching lines @@
   VLOG(1) << "DiskMountManager Shutdown completed";
 }
 
 // static
 DiskMountManager* DiskMountManager::GetInstance() {
   return g_disk_mount_manager;
 }
 
 }  // namespace disks
 }  // namespace chromeos