chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm - Issue 23727009: Cleanup: Remove chrome namespace for storage monitor and media galleries.

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/mac/mtp_device_delegate_impl_mac_unittest.mm

Issue 23727009: Cleanup: Remove chrome namespace for storage monitor and media galleries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix nit Created 7 years, 3 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/media_galleries/mac/mtp_device_delegate_impl_mac.mm ('k') | chrome/browser/media_galleries/media_file_system_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm

diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm

index f57ef185acbf75ed86df4812917090133d8a085d..bdab3237becf36160fb47d19121ed849d3074483 100644

--- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm

+++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm

@@ -184,15 +184,14 @@ class MTPDeviceDelegateImplMacTest : public testing::Test {

content::BrowserThread::IO));

ASSERT_TRUE(io_thread_->Start());

- chrome::test::TestStorageMonitor* monitor =

- chrome::test::TestStorageMonitor::CreateAndInstall();

+ TestStorageMonitor* monitor = TestStorageMonitor::CreateAndInstall();

manager_.SetNotifications(monitor->receiver());

camera_ = [MockMTPICCameraDevice alloc];

id<ICDeviceBrowserDelegate> delegate = manager_.device_browser();

[delegate deviceBrowser:nil didAddDevice:camera_ moreComing:NO];

- delegate_ = new chrome::MTPDeviceDelegateImplMac(kDeviceId, kDevicePath);

+ delegate_ = new MTPDeviceDelegateImplMac(kDeviceId, kDevicePath);

}

virtual void TearDown() OVERRIDE {

@@ -201,7 +200,7 @@ class MTPDeviceDelegateImplMacTest : public testing::Test {

delegate_->CancelPendingTasksAndDeleteDelegate();

- chrome::test::TestStorageMonitor::RemoveSingleton();

+ TestStorageMonitor::RemoveSingleton();

io_thread_->Stop();

}

@@ -308,11 +307,11 @@ class MTPDeviceDelegateImplMacTest : public testing::Test {

scoped_ptr<content::TestBrowserThread> file_thread_;

scoped_ptr<content::TestBrowserThread> io_thread_;

base::ScopedTempDir temp_dir_;

- chrome::ImageCaptureDeviceManager manager_;

+ ImageCaptureDeviceManager manager_;

MockMTPICCameraDevice* camera_;

// This object needs special deletion inside the above |task_runner_|.

- chrome::MTPDeviceDelegateImplMac* delegate_;

+ MTPDeviceDelegateImplMac* delegate_;

base::PlatformFileError error_;

base::PlatformFileInfo info_;