| Index: chrome/browser/storage_monitor/test_storage_monitor_win.cc | 
| diff --git a/chrome/browser/storage_monitor/test_removable_device_notifications_window_win.cc b/chrome/browser/storage_monitor/test_storage_monitor_win.cc | 
| similarity index 51% | 
| rename from chrome/browser/storage_monitor/test_removable_device_notifications_window_win.cc | 
| rename to chrome/browser/storage_monitor/test_storage_monitor_win.cc | 
| index fa642f8c0d3c69e3ee932a72d3e597992e3de126..dafb597a16db75072661cc77f24b5da478f2bd58 100644 | 
| --- a/chrome/browser/storage_monitor/test_removable_device_notifications_window_win.cc | 
| +++ b/chrome/browser/storage_monitor/test_storage_monitor_win.cc | 
| @@ -2,9 +2,9 @@ | 
| // Use of this source code is governed by a BSD-style license that can be | 
| // found in the LICENSE file. | 
| // | 
| -// TestRemovableDeviceNotificationsWindowWin implementation. | 
| +// TestStorageMonitorWin implementation. | 
|  | 
| -#include "chrome/browser/storage_monitor/test_removable_device_notifications_window_win.h" | 
| +#include "chrome/browser/storage_monitor/test_storage_monitor_win.h" | 
|  | 
| #include "chrome/browser/storage_monitor/test_portable_device_watcher_win.h" | 
| #include "chrome/browser/storage_monitor/test_volume_mount_watcher_win.h" | 
| @@ -12,28 +12,23 @@ | 
| namespace chrome { | 
| namespace test { | 
|  | 
| -TestRemovableDeviceNotificationsWindowWin:: | 
| -    TestRemovableDeviceNotificationsWindowWin( | 
| +TestStorageMonitorWin::TestStorageMonitorWin( | 
| TestVolumeMountWatcherWin* volume_mount_watcher, | 
| TestPortableDeviceWatcherWin* portable_device_watcher) | 
| -    : RemovableDeviceNotificationsWindowWin(volume_mount_watcher, | 
| -                                            portable_device_watcher) { | 
| +    : StorageMonitorWin(volume_mount_watcher, portable_device_watcher) { | 
| DCHECK(volume_mount_watcher_); | 
| DCHECK(portable_device_watcher); | 
| } | 
|  | 
| -TestRemovableDeviceNotificationsWindowWin:: | 
| -    ~TestRemovableDeviceNotificationsWindowWin() { | 
| +TestStorageMonitorWin::~TestStorageMonitorWin() { | 
| } | 
|  | 
| -void TestRemovableDeviceNotificationsWindowWin::InjectDeviceChange( | 
| -    UINT event_type, | 
| -    DWORD data) { | 
| +void TestStorageMonitorWin::InjectDeviceChange(UINT event_type, DWORD data) { | 
| OnDeviceChange(event_type, data); | 
| } | 
|  | 
| VolumeMountWatcherWin* | 
| -TestRemovableDeviceNotificationsWindowWin::volume_mount_watcher() { | 
| +TestStorageMonitorWin::volume_mount_watcher() { | 
| return volume_mount_watcher_.get(); | 
| } | 
|  | 
|  |