Revert of Pass task runners to AudioManager constructor.

media/audio/cras/cras_input_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // cras_util.h defines custom min/max macros which break compilation, so ensure
 // it's not included until last.  #if avoids presubmit errors.
 #if defined(USE_CRAS)
 #include "media/audio/cras/cras_input.h"
 #endif
 
 using testing::_;
 using testing::AtLeast;
 using testing::Ge;
 using testing::InvokeWithoutArgs;
 using testing::StrictMock;
 
 namespace media {
 
 class MockAudioInputCallback : public AudioInputStream::AudioInputCallback {
  public:
   MOCK_METHOD4(OnData,
                void(AudioInputStream*, const AudioBus*, uint32_t, double));
   MOCK_METHOD1(OnError, void(AudioInputStream*));
 };
 
 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
   // is managed inside MakeAudioInputStream, and we don't use
   // MakeAudioInputStream to create the stream in the tests.
   void ReleaseInputStream(AudioInputStream* stream) override {
     DCHECK(stream);
     delete stream;
   }
 
  private:
   FakeAudioLogFactory fake_audio_log_factory_;
 };
 
 class CrasInputStreamTest : public testing::Test {
  protected:
   CrasInputStreamTest() {
     mock_manager_.reset(new StrictMock<MockAudioManagerCrasInput>());
-    base::RunLoop().RunUntilIdle();
   }
 
-  ~CrasInputStreamTest() override {}
+  virtual ~CrasInputStreamTest() {
+  }
 
   CrasInputStream* CreateStream(ChannelLayout layout) {
     return CreateStream(layout, kTestFramesPerPacket);
   }
 
   CrasInputStream* CreateStream(ChannelLayout layout,
                                 int32_t samples_per_packet) {
     return CreateStream(layout, samples_per_packet,
                         AudioManagerBase::kDefaultDeviceId);
   }
@@ skipping 34 matching lines @@
     test_stream->Close();
   }
 
   static const unsigned int kTestBitsPerSample;
   static const unsigned int kTestCaptureDurationMs;
   static const ChannelLayout kTestChannelLayout;
   static const AudioParameters::Format kTestFormat;
   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);
 };
 
 const unsigned int CrasInputStreamTest::kTestBitsPerSample = 16;
 const unsigned int CrasInputStreamTest::kTestCaptureDurationMs = 250;
 const ChannelLayout CrasInputStreamTest::kTestChannelLayout =
     CHANNEL_LAYOUT_STEREO;
 const AudioParameters::Format CrasInputStreamTest::kTestFormat =
@@ skipping 82 matching lines @@
 TEST_F(CrasInputStreamTest, CaptureLoopback) {
   CrasInputStream* test_stream = CreateStream(
       CHANNEL_LAYOUT_STEREO,
       kTestFramesPerPacket,
       AudioManagerBase::kLoopbackInputDeviceId);
   EXPECT_TRUE(test_stream->Open());
   test_stream->Close();
 }
 
 }  // namespace media