Cleanup Various bits of Windows StorageMonitor classes.

chrome/browser/storage_monitor/test_volume_mount_watcher_win.h

Index: chrome/browser/storage_monitor/test_volume_mount_watcher_win.h
===================================================================
--- chrome/browser/storage_monitor/test_volume_mount_watcher_win.h	(revision 203027)
+++ chrome/browser/storage_monitor/test_volume_mount_watcher_win.h	(working copy)
@@ -27,9 +27,12 @@
   TestVolumeMountWatcherWin();
   virtual ~TestVolumeMountWatcherWin();
 
+  static bool GetDeviceRemovable(const base::FilePath& device_path,
+                                 bool* removable);
+
   void 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);
 
   void SetAttachedDevicesFake();
@@ -38,7 +41,7 @@
 
   virtual void DeviceCheckComplete(const base::FilePath& device_path);
 
-  std::vector<base::FilePath> devices_checked() const {
+  const std::vector<base::FilePath>& devices_checked() const {
       return devices_checked_;
   }
 
@@ -46,11 +49,7 @@
 
   void ReleaseDeviceCheck();
 
-  bool GetDeviceRemovable(const base::FilePath& device_path,
-      bool* removable) const;
-
   // VolumeMountWatcherWin:
-
   virtual GetAttachedDevicesCallbackType
       GetAttachedDevicesCallback() const OVERRIDE;
   virtual GetDeviceDetailsCallbackType