Cleanup Various bits of Windows StorageMonitor classes.

chrome/browser/storage_monitor/volume_mount_watcher_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_STORAGE_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 26 matching lines @@
   // Returns the volume file path of the drive specified by the |drive_number|.
   // |drive_number| inputs of 0 - 25 are valid. Returns an empty file path if
   // the |drive_number| is invalid.
   static base::FilePath DriveNumberToFilePath(int drive_number);
 
   void Init();
 
   // Gets the information about the device mounted at |device_path|. On success,
   // returns true and fills in |info|.
   // Can block during startup while device info is still loading.
-  virtual bool GetDeviceInfo(const base::FilePath& device_path,
-                             StorageInfo* info) const;
+  bool GetDeviceInfo(const base::FilePath& device_path,
+                     StorageInfo* info) const;
 
   // Processes DEV_BROADCAST_VOLUME messages and triggers a
   // notification if appropriate.
   void OnWindowMessage(UINT event_type, LPARAM data);
 
   // Set the volume notifications object to be used when new
   // removable volumes are found.
   void SetNotifications(StorageMonitor::Receiver* notifications);
 
   void EjectDevice(const std::string& device_id,
                    base::Callback<void(StorageMonitor::EjectStatus)> callback);
 
  protected:
   typedef base::Callback<bool(const base::FilePath&,
                               StorageInfo*)> GetDeviceDetailsCallbackType;
 
   typedef base::Callback<std::vector<base::FilePath>(void)>
       GetAttachedDevicesCallbackType;
 
   // Handles mass storage device attach event on UI thread.
   void HandleDeviceAttachEventOnUIThread(
       const base::FilePath& device_path,
       const StorageInfo& info);
 
   // Handles mass storage device detach event on UI thread.
-  void HandleDeviceDetachEventOnUIThread(const string16& device_location);
+  void HandleDeviceDetachEventOnUIThread(const base::string16& device_location);
 
   // UI thread delegate to set up adding storage devices.
   void AddDevicesOnUIThread(std::vector<base::FilePath> removable_devices);
 
   // Runs |get_device_details_callback| for |device_path| on a worker thread.
   // |volume_watcher| points back to the VolumeMountWatcherWin that called it.
   static void RetrieveInfoForDeviceAndAdd(
       const base::FilePath& device_path,
       const GetDeviceDetailsCallbackType& get_device_details_callback,
-      base::WeakPtr<chrome::VolumeMountWatcherWin> volume_watcher);
+      base::WeakPtr<VolumeMountWatcherWin> volume_watcher);
 
   // Mark that a device we started a metadata check for has completed.
   virtual void DeviceCheckComplete(const base::FilePath& device_path);
 
   virtual GetAttachedDevicesCallbackType GetAttachedDevicesCallback() const;
   virtual GetDeviceDetailsCallbackType GetDeviceDetailsCallback() const;
 
   // Worker pool used to collect device information. Used because some
   // devices freeze workers trying to get device info, resulting in
   // shutdown hangs.
   scoped_refptr<base::SequencedWorkerPool> device_info_worker_pool_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
  private:
   friend class test::TestVolumeMountWatcherWin;
 
   // Key: Mass storage device mount point.
   // Value: Mass storage device metadata.
-  typedef std::map<string16, StorageInfo> MountPointDeviceMetadataMap;
+  typedef std::map<base::string16, StorageInfo> MountPointDeviceMetadataMap;
 
   // Maintain a set of device attribute check calls in-flight. Only accessed
   // on the UI thread. This is to try and prevent the same device from
   // occupying our worker pool in case of windows API call hangs.
   std::set<base::FilePath> pending_device_checks_;
 
   // A map from device mount point to device metadata. Only accessed on the UI
   // thread.
   MountPointDeviceMetadataMap device_metadata_;
 
   base::WeakPtrFactory<VolumeMountWatcherWin> weak_factory_;
 
   // The notifications object to use to signal newly attached volumes. Only
   // removable devices will be notified.
   StorageMonitor::Receiver* notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeMountWatcherWin);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_