content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc - Issue 9805001: Move media/audio files into media namespace

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: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 9 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 | « content/browser/renderer_host/media/media_stream_dispatcher_host.cc ('k') | content/browser/renderer_host/media/media_stream_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

index 9c699edcdb342f4cc9cb7d4afdbdeda374894a7e..50f7356c5978ee9babd567a3f0bd82753e980b6f 100644

--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

@@ -37,7 +37,7 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost {

public:

MockMediaStreamDispatcherHost(content::ResourceContext* resource_context,

MessageLoop* message_loop,

- AudioManager* audio_manager)

+ media::AudioManager* audio_manager)

: MediaStreamDispatcherHost(resource_context, kProcessId, audio_manager),

message_loop_(message_loop) {}

virtual ~MockMediaStreamDispatcherHost() {}

@@ -153,7 +153,7 @@ class MediaStreamDispatcherHostTest : public testing::Test {

io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,

message_loop_.get()));

- audio_manager_.reset(AudioManager::Create());

+ audio_manager_.reset(media::AudioManager::Create());

// Make sure we use fake devices to avoid long delays.

MediaStreamManager::GetForResourceContext(

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

scoped_ptr<MessageLoop> message_loop_;

scoped_ptr<BrowserThreadImpl> ui_thread_;

scoped_ptr<BrowserThreadImpl> io_thread_;

- scoped_ptr<AudioManager> audio_manager_;

+ scoped_ptr<media::AudioManager> audio_manager_;

content::MockResourceContext resource_context_;

};