content/browser/renderer_host/media/audio_input_device_manager_unittest.cc - Issue 9965076: Revert 130180 - 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/audio_input_device_manager_unittest.cc

Issue 9965076: Revert 130180 - 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/audio_input_device_manager.cc ('k') | content/browser/renderer_host/media/audio_input_renderer_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- content/browser/renderer_host/media/audio_input_device_manager_unittest.cc (revision 130181)

+++ content/browser/renderer_host/media/audio_input_device_manager_unittest.cc (working copy)

@@ -105,7 +105,7 @@

message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));

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

message_loop_.get()));

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

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

manager_ = new AudioInputDeviceManager(audio_manager_.get());

audio_input_listener_.reset(new MockAudioInputDeviceManagerListener());

@@ -129,7 +129,7 @@

scoped_ptr<BrowserThreadImpl> io_thread_;

scoped_refptr<AudioInputDeviceManager> manager_;

scoped_ptr<MockAudioInputDeviceManagerListener> audio_input_listener_;

- scoped_ptr<media::AudioManager> audio_manager_;

+ scoped_ptr<AudioManager> audio_manager_;

private:

DISALLOW_COPY_AND_ASSIGN(AudioInputDeviceManagerTest);

@@ -414,11 +414,11 @@

manager_->Start(second_session_id, second_event_handler.get());

EXPECT_CALL(*first_event_handler,

DeviceStarted(first_session_id,

- media::AudioManagerBase::kDefaultDeviceId))

+ AudioManagerBase::kDefaultDeviceId))

.Times(1);

EXPECT_CALL(*second_event_handler,

DeviceStarted(second_session_id,

- media::AudioManagerBase::kDefaultDeviceId))

+ AudioManagerBase::kDefaultDeviceId))

.Times(1);

message_loop_->RunAllPending();

@@ -502,7 +502,7 @@

manager_->Start(session_id, audio_input_event_handler.get());

EXPECT_CALL(*audio_input_event_handler,

DeviceStarted(session_id,

- media::AudioManagerBase::kDefaultDeviceId))

+ AudioManagerBase::kDefaultDeviceId))

.Times(1);

message_loop_->RunAllPending();