Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/storage_monitor/volume_mount_watcher_win.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/volume_mount_watcher_win.h"
 
 #include <windows.h>
 
 #include <dbt.h>
 #include <fileapi.h>
@@ skipping 418 matching lines @@
 VolumeMountWatcherWin::GetDeviceDetailsCallbackType
     VolumeMountWatcherWin::GetDeviceDetailsCallback() const {
   return base::Bind(&GetDeviceDetails);
 }
 
 bool VolumeMountWatcherWin::GetDeviceInfo(const base::FilePath& device_path,
                                           StorageInfo* info) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::FilePath path(device_path);
   MountPointDeviceMetadataMap::const_iterator iter =
-      device_metadata_.find(path.value());
+      device_metadata_.find(path);
   while (iter == device_metadata_.end() && path.DirName() != path) {
     path = path.DirName();
-    iter = device_metadata_.find(path.value());
+    iter = device_metadata_.find(path);
   }
 
   if (iter == device_metadata_.end())
     return false;
 
   if (info)
     *info = iter->second;
 
   return true;
 }
@@ skipping 36 matching lines @@
 VolumeMountWatcherWin::~VolumeMountWatcherWin() {
   weak_factory_.InvalidateWeakPtrs();
   device_info_worker_pool_->Shutdown();
 }
 
 void VolumeMountWatcherWin::HandleDeviceAttachEventOnUIThread(
     const base::FilePath& device_path,
     const StorageInfo& info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  device_metadata_[device_path.value()] = info;
+  device_metadata_[device_path] = info;
 
   DeviceCheckComplete(device_path);
 
   // Don't call removable storage observers for fixed volumes.
   if (!StorageInfo::IsRemovableDevice(info.device_id))
     return;
 
   if (notifications_)
     notifications_->ProcessAttach(info);
 }
 
 void VolumeMountWatcherWin::HandleDeviceDetachEventOnUIThread(
     const string16& device_location) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   MountPointDeviceMetadataMap::const_iterator device_info =
-      device_metadata_.find(device_location);
+      device_metadata_.find(base::FilePath(device_location));
   // If the device isn't type removable (like a CD), it won't be there.
   if (device_info == device_metadata_.end())
     return;
 
   if (notifications_)
     notifications_->ProcessDetach(device_info->second.device_id);
   device_metadata_.erase(device_info);
 }
 
 void VolumeMountWatcherWin::EjectDevice(
     const std::string& device_id,
     base::Callback<void(StorageMonitor::EjectStatus)> callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::FilePath device =
       chrome::MediaStorageUtil::FindDevicePathById(device_id);
   if (device.empty()) {
     callback.Run(StorageMonitor::EJECT_FAILURE);
     return;
   }
-  if (device_metadata_.erase(device.value()) == 0) {
+  if (device_metadata_.erase(device) == 0) {
     callback.Run(StorageMonitor::EJECT_FAILURE);
     return;
   }
 
   task_runner_->PostTask(FROM_HERE,
       base::Bind(&EjectDeviceInThreadPool, device, callback, task_runner_, 0));
 }
 
 }  // namespace chrome