| 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 9062bbda09118d6b41c7807044e5e335fc4b74f5..3735322b0077ff1e35abac75b408c8963719cf7c 100644
|
| --- a/media/audio/cras/cras_input_unittest.cc
|
| +++ b/media/audio/cras/cras_input_unittest.cc
|
| @@ -4,15 +4,11 @@
|
|
|
| #include <stdint.h>
|
|
|
| -#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/run_loop.h"
|
| #include "base/synchronization/waitable_event.h"
|
| -#include "base/test/test_message_loop.h"
|
| #include "base/test/test_timeouts.h"
|
| -#include "base/thread_task_runner_handle.h"
|
| #include "base/time/time.h"
|
| #include "media/audio/cras/audio_manager_cras.h"
|
| #include "media/audio/fake_audio_log_factory.h"
|
| @@ -42,10 +38,7 @@
|
|
|
| class MockAudioManagerCrasInput : public AudioManagerCras {
|
| public:
|
| - MockAudioManagerCrasInput()
|
| - : AudioManagerCras(base::ThreadTaskRunnerHandle::Get(),
|
| - base::ThreadTaskRunnerHandle::Get(),
|
| - &fake_audio_log_factory_) {}
|
| + MockAudioManagerCrasInput() : AudioManagerCras(&fake_audio_log_factory_) {}
|
|
|
| // We need to override this function in order to skip checking the number
|
| // of active output streams. It is because the number of active streams
|
| @@ -64,10 +57,10 @@
|
| protected:
|
| CrasInputStreamTest() {
|
| mock_manager_.reset(new StrictMock<MockAudioManagerCrasInput>());
|
| - base::RunLoop().RunUntilIdle();
|
| - }
|
| -
|
| - ~CrasInputStreamTest() override {}
|
| + }
|
| +
|
| + virtual ~CrasInputStreamTest() {
|
| + }
|
|
|
| CrasInputStream* CreateStream(ChannelLayout layout) {
|
| return CreateStream(layout, kTestFramesPerPacket);
|
| @@ -122,9 +115,7 @@
|
| static const uint32_t kTestFramesPerPacket;
|
| static const int kTestSampleRate;
|
|
|
| - base::TestMessageLoop message_loop_;
|
| - std::unique_ptr<StrictMock<MockAudioManagerCrasInput>, AudioManagerDeleter>
|
| - mock_manager_;
|
| + scoped_ptr<StrictMock<MockAudioManagerCrasInput> > mock_manager_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(CrasInputStreamTest);
|
|
|