Index: content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc |
diff --git a/content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc b/content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc |
index 65f8bea3c720640f5e86086e16769518c2cee14f..74822a9ec7597294bf11815fd25da3966ac1f0aa 100644 |
--- a/content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc |
+++ b/content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc |
@@ -15,12 +15,12 @@ |
#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
#include "base/sync_socket.h" |
-#include "content/browser/audio_manager_thread.h" |
#include "content/browser/media/capture/audio_mirroring_manager.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/media_observer.h" |
#include "content/public/test/test_browser_thread_bundle.h" |
#include "media/audio/audio_output_controller.h" |
+#include "media/audio/audio_thread_impl.h" |
#include "media/audio/fake_audio_log_factory.h" |
#include "media/audio/fake_audio_manager.h" |
#include "media/base/media_switches.h" |
@@ -110,12 +110,11 @@ class AudioOutputDelegateTest : public testing::Test { |
// approximate the real conditions of AudioOutputDelegate well. |
thread_bundle_ = base::MakeUnique<TestBrowserThreadBundle>( |
TestBrowserThreadBundle::Options::REAL_IO_THREAD); |
- audio_thread_ = base::MakeUnique<AudioManagerThread>(); |
audio_manager_.reset(new media::FakeAudioManager( |
- audio_thread_->task_runner(), audio_thread_->worker_task_runner(), |
- &log_factory_)); |
+ base::MakeUnique<media::AudioThreadImpl>(), &log_factory_)); |
} |
+ ~AudioOutputDelegateTest() { audio_manager_->Shutdown(); } |
// Test bodies are here, so that we can run them on the IO thread. |
void CreateTest(base::Closure done) { |
@@ -432,8 +431,7 @@ class AudioOutputDelegateTest : public testing::Test { |
protected: |
std::unique_ptr<TestBrowserThreadBundle> thread_bundle_; |
- std::unique_ptr<AudioManagerThread> audio_thread_; |
- media::ScopedAudioManagerPtr audio_manager_; |
+ std::unique_ptr<media::AudioManager> audio_manager_; |
StrictMock<MockAudioMirroringManager> mirroring_manager_; |
StrictMock<MockEventHandler> event_handler_; |
StrictMock<MockObserver> media_observer_; |