| Index: media/audio/android/audio_android_unittest.cc
|
| diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
|
| index d5ca8c9163a79f937ce92fe63776df6eb58eb751..c0ee30fafb28861b4a65b748e6df48da38c7b6bf 100644
|
| --- a/media/audio/android/audio_android_unittest.cc
|
| +++ b/media/audio/android/audio_android_unittest.cc
|
| @@ -25,6 +25,7 @@
|
| #include "media/audio/audio_io.h"
|
| #include "media/audio/audio_unittest_util.h"
|
| #include "media/audio/mock_audio_source_callback.h"
|
| +#include "media/audio/test_audio_thread.h"
|
| #include "media/base/decoder_buffer.h"
|
| #include "media/base/seekable_buffer.h"
|
| #include "media/base/test_data_util.h"
|
| @@ -422,14 +423,15 @@ class AudioAndroidOutputTest : public testing::Test {
|
| public:
|
| AudioAndroidOutputTest()
|
| : loop_(new base::MessageLoopForUI()),
|
| - audio_manager_(AudioManager::CreateForTesting(loop_->task_runner())),
|
| + audio_manager_(AudioManager::CreateForTesting(
|
| + base::MakeUnique<TestAudioThread>())),
|
| audio_output_stream_(NULL) {
|
| // Flush the message loop to ensure that AudioManager is fully initialized.
|
| base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| ~AudioAndroidOutputTest() override {
|
| - audio_manager_.reset();
|
| + audio_manager_->Shutdown();
|
| base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| @@ -577,7 +579,7 @@ class AudioAndroidOutputTest : public testing::Test {
|
| }
|
|
|
| std::unique_ptr<base::MessageLoopForUI> loop_;
|
| - ScopedAudioManagerPtr audio_manager_;
|
| + std::unique_ptr<AudioManager> audio_manager_;
|
| AudioParameters audio_output_parameters_;
|
| AudioOutputStream* audio_output_stream_;
|
| base::TimeTicks start_time_;
|
|
|