Index: media/audio/cras/cras_input_unittest.cc |
diff --git a/media/audio/cras/cras_input_unittest.cc b/media/audio/cras/cras_input_unittest.cc |
index 5b848945ca85abc674f47f94bcc7b714bbef346d..46bad85b881faf6a5fc4388713930fc6aa5b6524 100644 |
--- a/media/audio/cras/cras_input_unittest.cc |
+++ b/media/audio/cras/cras_input_unittest.cc |
@@ -17,6 +17,7 @@ |
#include "media/audio/audio_device_description.h" |
#include "media/audio/cras/audio_manager_cras.h" |
#include "media/audio/fake_audio_log_factory.h" |
+#include "media/audio/test_audio_thread.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -44,8 +45,7 @@ class MockAudioInputCallback : public AudioInputStream::AudioInputCallback { |
class MockAudioManagerCrasInput : public AudioManagerCras { |
public: |
MockAudioManagerCrasInput() |
- : AudioManagerCras(base::ThreadTaskRunnerHandle::Get(), |
- base::ThreadTaskRunnerHandle::Get(), |
+ : AudioManagerCras(base::MakeUnique<TestAudioThread>(), |
&fake_audio_log_factory_) {} |
// We need to override this function in order to skip checking the number |
@@ -68,7 +68,7 @@ class CrasInputStreamTest : public testing::Test { |
base::RunLoop().RunUntilIdle(); |
} |
- ~CrasInputStreamTest() override {} |
+ ~CrasInputStreamTest() override { mock_manager_->Shutdown(); } |
CrasInputStream* CreateStream(ChannelLayout layout) { |
return CreateStream(layout, kTestFramesPerPacket); |
@@ -125,8 +125,7 @@ class CrasInputStreamTest : public testing::Test { |
static const int kTestSampleRate; |
base::TestMessageLoop message_loop_; |
- std::unique_ptr<StrictMock<MockAudioManagerCrasInput>, AudioManagerDeleter> |
- mock_manager_; |
+ std::unique_ptr<StrictMock<MockAudioManagerCrasInput>> mock_manager_; |
private: |
DISALLOW_COPY_AND_ASSIGN(CrasInputStreamTest); |