| 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 4fac69d7dda1061c9410aa089a463030e7ef8f20..aa90149567a9ccbc643950bd775ec9794508a24a 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
|
| @@ -65,13 +65,8 @@ class MAYBE_AudioInputDeviceManagerTest : public testing::Test {
|
| message_loop_.reset(new base::MessageLoopForIO);
|
| io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
|
| message_loop_.get()));
|
| - audio_manager_.reset(media::AudioManager::CreateForTesting());
|
| - // Wait for audio thread initialization to complete. Otherwise the
|
| - // enumeration type may not have been set yet.
|
| - base::WaitableEvent event(false, false);
|
| - audio_manager_->GetTaskRunner()->PostTask(FROM_HERE, base::Bind(
|
| - &base::WaitableEvent::Signal, base::Unretained(&event)));
|
| - event.Wait();
|
| + audio_manager_ =
|
| + media::AudioManager::CreateForTesting(message_loop_->task_runner());
|
| manager_ = new AudioInputDeviceManager(audio_manager_.get());
|
| manager_->UseFakeDevice();
|
| audio_input_listener_.reset(new MockAudioInputDeviceManagerListener());
|
| @@ -98,7 +93,7 @@ class MAYBE_AudioInputDeviceManagerTest : public testing::Test {
|
| scoped_ptr<BrowserThreadImpl> io_thread_;
|
| scoped_refptr<AudioInputDeviceManager> manager_;
|
| scoped_ptr<MockAudioInputDeviceManagerListener> audio_input_listener_;
|
| - scoped_ptr<media::AudioManager> audio_manager_;
|
| + media::ScopedAudioManagerPtr audio_manager_;
|
| StreamDeviceInfoArray devices_;
|
|
|
| private:
|
|
|