| Index: chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
|
| diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
|
| index 93fd98311ccbb33c3e42abdd4d1f0f7e52014371..8a4a67c95520052d06cb06cd0852f9701c08bc9a 100644
|
| --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
|
| +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
|
| @@ -28,8 +28,6 @@
|
| #include "content/public/browser/web_contents.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -namespace chrome {
|
| -
|
| namespace {
|
|
|
| typedef std::map<MediaGalleryPrefId, MediaFileSystemInfo> FSInfoMap;
|
| @@ -63,7 +61,7 @@ class MTPDeviceDelegateImplWinTest : public ChromeRenderViewHostTestHarness {
|
| bool media_device);
|
|
|
| // Pointer to the storage monitor. Owned by TestingBrowserProcess.
|
| - test::TestStorageMonitorWin* monitor_;
|
| + TestStorageMonitorWin* monitor_;
|
| scoped_refptr<extensions::Extension> extension_;
|
|
|
| EnsureMediaDirectoriesExists media_directories_;
|
| @@ -72,15 +70,13 @@ class MTPDeviceDelegateImplWinTest : public ChromeRenderViewHostTestHarness {
|
| void MTPDeviceDelegateImplWinTest::SetUp() {
|
| ChromeRenderViewHostTestHarness::SetUp();
|
|
|
| - test::TestStorageMonitor::RemoveSingleton();
|
| - test::TestPortableDeviceWatcherWin* portable_device_watcher =
|
| - new test::TestPortableDeviceWatcherWin;
|
| - test::TestVolumeMountWatcherWin* mount_watcher =
|
| - new test::TestVolumeMountWatcherWin;
|
| + TestStorageMonitor::RemoveSingleton();
|
| + TestPortableDeviceWatcherWin* portable_device_watcher =
|
| + new TestPortableDeviceWatcherWin;
|
| + TestVolumeMountWatcherWin* mount_watcher = new TestVolumeMountWatcherWin;
|
| portable_device_watcher->set_use_dummy_mtp_storage_info(true);
|
| - scoped_ptr<test::TestStorageMonitorWin> monitor(
|
| - new test::TestStorageMonitorWin(
|
| - mount_watcher, portable_device_watcher));
|
| + scoped_ptr<TestStorageMonitorWin> monitor(
|
| + new TestStorageMonitorWin(mount_watcher, portable_device_watcher));
|
| TestingBrowserProcess* browser_process = TestingBrowserProcess::GetGlobal();
|
| DCHECK(browser_process);
|
| monitor_ = monitor.get();
|
| @@ -105,7 +101,7 @@ void MTPDeviceDelegateImplWinTest::SetUp() {
|
| void MTPDeviceDelegateImplWinTest::TearDown() {
|
| // Windows storage monitor must be destroyed on the same thread
|
| // as construction.
|
| - test::TestStorageMonitor::RemoveSingleton();
|
| + TestStorageMonitor::RemoveSingleton();
|
|
|
| ChromeRenderViewHostTestHarness::TearDown();
|
| }
|
| @@ -151,7 +147,7 @@ void MTPDeviceDelegateImplWinTest::CheckGalleryInfo(
|
| TEST_F(MTPDeviceDelegateImplWinTest, GalleryNameMTP) {
|
| base::FilePath location(
|
| PortableDeviceWatcherWin::GetStoragePathFromStorageId(
|
| - test::TestPortableDeviceWatcherWin::kStorageUniqueIdA));
|
| + TestPortableDeviceWatcherWin::kStorageUniqueIdA));
|
| AttachDevice(StorageInfo::MTP_OR_PTP, "mtp_fake_id", location);
|
|
|
| content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
|
| @@ -175,5 +171,3 @@ TEST_F(MTPDeviceDelegateImplWinTest, GalleryNameMTP) {
|
| }
|
| EXPECT_TRUE(checked);
|
| }
|
| -
|
| -} // namespace chrome
|
|
|