Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Unified Diff: content/browser/renderer_host/media/audio_input_device_manager_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
Index: content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
index 173606a48f094b80dae90dfa29d1b3315128afaa..fe57150d6747de15616b50c29d8ad9b4a1fd0b82 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
+++ b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
@@ -105,7 +105,7 @@ class AudioInputDeviceManagerTest : public testing::Test {
message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
message_loop_.get()));
- audio_manager_.reset(AudioManager::Create());
+ audio_manager_.reset(media::AudioManager::Create());
manager_ = new AudioInputDeviceManager(audio_manager_.get());
audio_input_listener_.reset(new MockAudioInputDeviceManagerListener());
@@ -129,7 +129,7 @@ class AudioInputDeviceManagerTest : public testing::Test {
scoped_ptr<BrowserThreadImpl> io_thread_;
scoped_refptr<AudioInputDeviceManager> manager_;
scoped_ptr<MockAudioInputDeviceManagerListener> audio_input_listener_;
- scoped_ptr<AudioManager> audio_manager_;
+ scoped_ptr<media::AudioManager> audio_manager_;
private:
DISALLOW_COPY_AND_ASSIGN(AudioInputDeviceManagerTest);
@@ -414,11 +414,11 @@ TEST_F(AudioInputDeviceManagerTest, StartDeviceTwice) {
manager_->Start(second_session_id, second_event_handler.get());
EXPECT_CALL(*first_event_handler,
DeviceStarted(first_session_id,
- AudioManagerBase::kDefaultDeviceId))
+ media::AudioManagerBase::kDefaultDeviceId))
.Times(1);
EXPECT_CALL(*second_event_handler,
DeviceStarted(second_session_id,
- AudioManagerBase::kDefaultDeviceId))
+ media::AudioManagerBase::kDefaultDeviceId))
.Times(1);
message_loop_->RunAllPending();
@@ -502,7 +502,7 @@ TEST_F(AudioInputDeviceManagerTest, StartSessionTwice) {
manager_->Start(session_id, audio_input_event_handler.get());
EXPECT_CALL(*audio_input_event_handler,
DeviceStarted(session_id,
- AudioManagerBase::kDefaultDeviceId))
+ media::AudioManagerBase::kDefaultDeviceId))
.Times(1);
message_loop_->RunAllPending();

Powered by Google App Engine
This is Rietveld 408576698