Rename RemovableDeviceNotifications=>StorageMonitor

chrome/browser/media_galleries/media_file_system_registry_unittest.cc

 // 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.
 
 // MediaFileSystemRegistry unit tests.
 
 #include <algorithm>
 #include <set>
 
 #include "base/command_line.h"
@@ skipping 31 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/web_contents_tester.h"
 #include "sync/api/string_ordinal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/storage_monitor/test_portable_device_watcher_win.h"
-#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_volume_mount_watcher_win.h"
 #include "chrome/common/chrome_switches.h"
 #endif
 
 namespace chrome {
 
 // Not anonymous so it can be friends with MediaFileSystemRegistry.
 class TestMediaFileSystemContext : public MediaFileSystemContext {
  public:
   struct FSInfo {
@@ skipping 334 matching lines @@
 
   // MediaFileSystemRegistry owns this.
   TestMediaFileSystemContext* test_file_system_context_;
 
   // Needed for extension service & friends to work.
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
 // TODO(gbillock): Eliminate windows-specific code from this test.
 #if defined(OS_WIN)
-  scoped_ptr<test::TestRemovableDeviceNotificationsWindowWin> window_;
+  scoped_ptr<test::TestStorageMonitorWin> monitor_;
 #else
   chrome::test::TestStorageMonitor monitor_;
 #endif
 
   MockProfileSharedRenderProcessHostFactory rph_factory_;
 
   ScopedVector<ProfileState> profile_states_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistryTest);
 };
@@ skipping 354 matching lines @@
   return result;
 }
 
 void MediaFileSystemRegistryTest::SetUp() {
 #if defined(OS_WIN)
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableMediaTransferProtocolDeviceOperations);
   test::TestPortableDeviceWatcherWin* portable_device_watcher =
       new test::TestPortableDeviceWatcherWin;
   portable_device_watcher->set_use_dummy_mtp_storage_info(true);
-  window_.reset(new test::TestRemovableDeviceNotificationsWindowWin(
-      new test::TestVolumeMountWatcherWin, portable_device_watcher));
-  window_->Init();
+  monitor_.reset(
+      new test::TestStorageMonitorWin(new test::TestVolumeMountWatcherWin,
+                                      portable_device_watcher));
+  monitor_->Init();
 #endif
 
   ChromeRenderViewHostTestHarness::SetUp();
   DeleteContents();
   SetRenderProcessHostFactory(&rph_factory_);
 
   TestMediaStorageUtil::SetTestingMode();
   test_file_system_context_ = new TestMediaFileSystemContext(
       g_browser_process->media_file_system_registry());
   (new extensions::BackgroundManifestHandler)->Register();
@@ skipping 224 matching lines @@
   pref_info_with_relpath.device_id = device_id;
   EXPECT_EQ(dcim_dir().Append(pref_info_with_relpath.path).value(),
             pref_info_with_relpath.AbsolutePath().value());
 
   DetachDevice(device_id);
   EXPECT_TRUE(pref_info.AbsolutePath().empty());
   EXPECT_TRUE(pref_info_with_relpath.AbsolutePath().empty());
 }
 
 }  // namespace chrome