Reland: Pass task runners to AudioManager constructor.

media/audio/cras/cras_unified_unittest.cc

 // Copyright 2013 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 <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 "media/audio/mock_audio_source_callback.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_unified.h"
 #endif
 
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
 using testing::Return;
 using testing::SetArgumentPointee;
 using testing::StrictMock;
 
 namespace media {
 
 class MockAudioManagerCras : public AudioManagerCras {
  public:
-  MockAudioManagerCras() : AudioManagerCras(&fake_audio_log_factory_) {}
+  MockAudioManagerCras()
+      : AudioManagerCras(base::ThreadTaskRunnerHandle::Get(),
+                         base::ThreadTaskRunnerHandle::Get(),
+                         &fake_audio_log_factory_) {}
 
   MOCK_METHOD0(Init, void());
   MOCK_METHOD0(HasAudioOutputDevices, bool());
   MOCK_METHOD0(HasAudioInputDevices, bool());
   MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*(
       const AudioParameters& params));
   MOCK_METHOD2(MakeLowLatencyOutputStream,
                AudioOutputStream*(const AudioParameters& params,
                                   const std::string& device_id));
   MOCK_METHOD2(MakeLinearOutputStream, AudioInputStream*(
@@ skipping 11 matching lines @@
   }
 
  private:
   FakeAudioLogFactory fake_audio_log_factory_;
 };
 
 class CrasUnifiedStreamTest : public testing::Test {
  protected:
   CrasUnifiedStreamTest() {
     mock_manager_.reset(new StrictMock<MockAudioManagerCras>());
+    base::RunLoop().RunUntilIdle();
   }
 
-  virtual ~CrasUnifiedStreamTest() {
-  }
+  ~CrasUnifiedStreamTest() override {}
 
   CrasUnifiedStream* CreateStream(ChannelLayout layout) {
     return CreateStream(layout, kTestFramesPerPacket);
   }
 
   CrasUnifiedStream* CreateStream(ChannelLayout layout,
                                   int32_t samples_per_packet) {
     AudioParameters params(kTestFormat, layout, kTestSampleRate,
                            kTestBitsPerSample, samples_per_packet);
     return new CrasUnifiedStream(params, mock_manager_.get());
   }
 
   MockAudioManagerCras& mock_manager() {
     return *(mock_manager_.get());
   }
 
   static const ChannelLayout kTestChannelLayout;
   static const int kTestSampleRate;
   static const int kTestBitsPerSample;
   static const AudioParameters::Format kTestFormat;
   static const uint32_t kTestFramesPerPacket;
 
-  scoped_ptr<StrictMock<MockAudioManagerCras> > mock_manager_;
+  base::TestMessageLoop message_loop_;
+  scoped_ptr<StrictMock<MockAudioManagerCras>, AudioManagerDeleter>
+      mock_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CrasUnifiedStreamTest);
 };
 
 const ChannelLayout CrasUnifiedStreamTest::kTestChannelLayout =
     CHANNEL_LAYOUT_STEREO;
 const int CrasUnifiedStreamTest::kTestSampleRate =
     AudioParameters::kAudioCDSampleRate;
 const int CrasUnifiedStreamTest::kTestBitsPerSample = 16;
@@ skipping 49 matching lines @@
 
   // Wait for samples to be captured.
   EXPECT_TRUE(event.TimedWait(TestTimeouts::action_timeout()));
 
   test_stream->Stop();
 
   test_stream->Close();
 }
 
 }  // namespace media