Rename RemovableDeviceNotifications=>StorageMonitor

chrome/browser/storage_monitor/storage_monitor_win.h

Index: chrome/browser/storage_monitor/storage_monitor_win.h
diff --git a/chrome/browser/storage_monitor/removable_device_notifications_window_win.h b/chrome/browser/storage_monitor/storage_monitor_win.h
similarity index 83%
rename from chrome/browser/storage_monitor/removable_device_notifications_window_win.h
rename to chrome/browser/storage_monitor/storage_monitor_win.h
index 3c049e7e572dd5487e953060c09b052cde4b70dd..ea7195bfb006ee5fd46de9be623dec1f97fd6d68 100644
--- a/chrome/browser/storage_monitor/removable_device_notifications_window_win.h
+++ b/chrome/browser/storage_monitor/storage_monitor_win.h
@@ -17,19 +17,19 @@ class FilePath;
 namespace chrome {
 
 namespace test {
-class TestRemovableDeviceNotificationsWindowWin;
+class TestStorageMonitorWindowWin;

[vandebo (ex-Chrome), 2013/03/01 19:47:39]

TestStorageMonitorWin

 }
 
 class PortableDeviceWatcherWin;
 class VolumeMountWatcherWin;
 
-class RemovableDeviceNotificationsWindowWin : public StorageMonitor {
+class StorageMonitorWin : public StorageMonitor {
  public:
-  // Creates an instance of RemovableDeviceNotificationsWindowWin. Should only
+  // Creates an instance of StorageMonitorWindowWin. Should only
   // be called by browser start up code. Use GetInstance() instead.
-  static RemovableDeviceNotificationsWindowWin* Create();
+  static StorageMonitorWin* Create();
 
-  virtual ~RemovableDeviceNotificationsWindowWin();
+  virtual ~StorageMonitorWin();
 
   // Must be called after the file thread is created.
   void Init();
@@ -48,12 +48,12 @@ class RemovableDeviceNotificationsWindowWin : public StorageMonitor {
 
  private:
   class PortableDeviceNotifications;
-  friend class test::TestRemovableDeviceNotificationsWindowWin;
+  friend class test::TestStorageMonitorWindowWin;
 
   // To support unit tests, this constructor takes |volume_mount_watcher| and
   // |portable_device_watcher| objects. These params are either constructed in
-  // unit tests or in RemovableDeviceNotificationsWindowWin::Create() function.
-  RemovableDeviceNotificationsWindowWin(
+  // unit tests or in StorageMonitorWindowWin::Create() function.
+  StorageMonitorWin(

[vandebo (ex-Chrome), 2013/03/01 19:47:39]

nit: line wrap.

       VolumeMountWatcherWin* volume_mount_watcher,
       PortableDeviceWatcherWin* portable_device_watcher);
 
@@ -89,7 +89,7 @@ class RemovableDeviceNotificationsWindowWin : public StorageMonitor {
   // devices.
   scoped_ptr<PortableDeviceWatcherWin> portable_device_watcher_;
 
-  DISALLOW_COPY_AND_ASSIGN(RemovableDeviceNotificationsWindowWin);
+  DISALLOW_COPY_AND_ASSIGN(StorageMonitorWin);
 };
 
 }  // namespace chrome