Cleanup Various bits of Windows StorageMonitor classes.

chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc

 // Copyright (c) 2013 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.
 //
 // TestVolumeMountWatcherWin implementation.
 
 #include "chrome/browser/storage_monitor/test_volume_mount_watcher_win.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 40 matching lines @@
 
   StorageInfo::Type type = StorageInfo::FIXED_MASS_STORAGE;
   if (path.value() != ASCIIToUTF16("N:\\") &&
       path.value() != ASCIIToUTF16("C:\\")) {
     type = StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM;
   }
   std::string unique_id =
       "\\\\?\\Volume{00000000-0000-0000-0000-000000000000}\\";
   unique_id[11] = device_path.value()[0];
   std::string device_id = StorageInfo::MakeDeviceId(type, unique_id);
-  string16 storage_label = path.Append(L" Drive").LossyDisplayName();
-  *info = StorageInfo(device_id, string16(), path.value(), storage_label,
-                      string16(), string16(), 1000000);
+  base::string16 storage_label = path.Append(L" Drive").LossyDisplayName();
+  *info = StorageInfo(device_id, base::string16(), path.value(), storage_label,
+                      base::string16(), base::string16(), 1000000);
 
   return true;
 }
 
 }  // namespace
 
 // TestVolumeMountWatcherWin ---------------------------------------------------
 
 TestVolumeMountWatcherWin::TestVolumeMountWatcherWin()
     : attached_devices_fake_(false) {}
 
 TestVolumeMountWatcherWin::~TestVolumeMountWatcherWin() {
 }
 
 void TestVolumeMountWatcherWin::AddDeviceForTesting(
     const base::FilePath& device_path,
     const std::string& device_id,
-    const string16& device_name,
+    const base::string16& device_name,
     uint64 total_size_in_bytes) {
   StorageInfo info(device_id, device_name, device_path.value(),
-                   string16(), string16(), string16(), total_size_in_bytes);
+                   base::string16(), base::string16(), base::string16(),
+                   total_size_in_bytes);
   HandleDeviceAttachEventOnUIThread(device_path, info);
 }
 
 void TestVolumeMountWatcherWin::SetAttachedDevicesFake() {
   attached_devices_fake_ = true;
 }
 
 void TestVolumeMountWatcherWin::FlushWorkerPoolForTesting() {
   device_info_worker_pool_->FlushForTesting();
 }
 
 void TestVolumeMountWatcherWin::DeviceCheckComplete(
     const base::FilePath& device_path) {
   devices_checked_.push_back(device_path);
   if (device_check_complete_event_.get())
     device_check_complete_event_->Wait();
   VolumeMountWatcherWin::DeviceCheckComplete(device_path);
 }
 
 void TestVolumeMountWatcherWin::BlockDeviceCheckForTesting() {
   device_check_complete_event_.reset(new base::WaitableEvent(false, false));
   devices_checked_.clear();
 }
 
 void TestVolumeMountWatcherWin::ReleaseDeviceCheck() {
   device_check_complete_event_->Signal();
 }
 
+// static
 bool TestVolumeMountWatcherWin::GetDeviceRemovable(
     const base::FilePath& device_path,
-    bool* removable) const {
+    bool* removable) {
   StorageInfo info;
   bool success = GetMassStorageDeviceDetails(device_path, &info);
   *removable = StorageInfo::IsRemovableDevice(info.device_id());
   return success;
 }
 
 VolumeMountWatcherWin::GetDeviceDetailsCallbackType
 TestVolumeMountWatcherWin::GetDeviceDetailsCallback() const {
   return base::Bind(&GetMassStorageDeviceDetails);
 }
 
 VolumeMountWatcherWin::GetAttachedDevicesCallbackType
   TestVolumeMountWatcherWin::GetAttachedDevicesCallback() const {
   if (attached_devices_fake_)
     return base::Bind(&FakeGetAttachedDevices);
-
   return base::Bind(&FakeGetSingleAttachedDevice);
 }
 
 void TestVolumeMountWatcherWin::ShutdownWorkerPool() {
   device_info_worker_pool_->Shutdown();
 }
 
 }  // namespace test
 }  // namespace chrome