chrome/browser/media_galleries/media_file_system_registry_unittest.cc - Issue 12382005: Rename RemovableDeviceNotifications=>StorageMonitor

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media_galleries/media_file_system_registry_unittest.cc

Issue 12382005: Rename RemovableDeviceNotifications=>StorageMonitor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/media_file_system_registry_unittest.cc

diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc

index ec08062b946a17112f3ff6f953d37ef38150a4ec..b54261ae03a9a85e275f6111558299b9e56d74cb 100644

--- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc

+++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc

@@ -49,7 +49,7 @@

#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

@@ -404,7 +404,7 @@ class MediaFileSystemRegistryTest : public ChromeRenderViewHostTestHarness {

// 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

@@ -779,9 +779,10 @@ void MediaFileSystemRegistryTest::SetUp() {

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();