Cleanup Various bits of Windows StorageMonitor classes.

chrome/browser/storage_monitor/storage_monitor_win.h

Index: chrome/browser/storage_monitor/storage_monitor_win.h
===================================================================
--- chrome/browser/storage_monitor/storage_monitor_win.h	(revision 203027)
+++ chrome/browser/storage_monitor/storage_monitor_win.h	(working copy)
@@ -39,8 +39,8 @@
                                      StorageInfo* device_info) const OVERRIDE;
   virtual bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
-      string16* device_location,
-      string16* storage_object_id) const OVERRIDE;
+      base::string16* device_location,
+      base::string16* storage_object_id) const OVERRIDE;
 
   virtual void EjectDevice(
       const std::string& device_id,
@@ -57,8 +57,7 @@
                     PortableDeviceWatcherWin* portable_device_watcher);
 
   // Gets the removable storage information given a |device_path|. On success,
-  // returns true and fills in |device_location|, |unique_id|, |name| and
-  // |removable|, and |total_size_in_bytes|.
+  // returns true and fills in |info|.
   bool GetDeviceInfo(const base::FilePath& device_path,
                      StorageInfo* info) const;