Reland: Pass task runners to AudioManager constructor.

media/audio/audio_output_proxy_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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_output_dispatcher_impl.h"
 #include "media/audio/audio_output_proxy.h"
 #include "media/audio/audio_output_resampler.h"
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/audio/fake_audio_output_stream.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 59 matching lines @@
 
  private:
   bool start_called_;
   bool stop_called_;
   AudioParameters params_;
   scoped_ptr<AudioOutputStream> fake_output_stream_;
 };
 
 class MockAudioManager : public AudioManagerBase {
  public:
-  MockAudioManager() : AudioManagerBase(&fake_audio_log_factory_) {}
-  virtual ~MockAudioManager() {
-    Shutdown();
-  }
+  MockAudioManager()
+      : AudioManagerBase(base::ThreadTaskRunnerHandle::Get(),
+                         base::ThreadTaskRunnerHandle::Get(),
+                         &fake_audio_log_factory_) {}
+  ~MockAudioManager() override { Shutdown(); }
 
   MOCK_METHOD0(HasAudioOutputDevices, bool());
   MOCK_METHOD0(HasAudioInputDevices, bool());
   MOCK_METHOD0(GetAudioInputDeviceModel, base::string16());
   MOCK_METHOD2(MakeAudioOutputStream, AudioOutputStream*(
       const AudioParameters& params,
       const std::string& device_id));
   MOCK_METHOD2(MakeAudioOutputStreamProxy, AudioOutputStream*(
       const AudioParameters& params,
       const std::string& device_id));
@@ skipping 32 matching lines @@
   MOCK_METHOD1(OnError, void(AudioOutputStream* stream));
 };
 
 }  // namespace
 
 namespace media {
 
 class AudioOutputProxyTest : public testing::Test {
  protected:
   void SetUp() override {
-    EXPECT_CALL(manager_, GetTaskRunner())
-        .WillRepeatedly(Return(message_loop_.task_runner()));
-    EXPECT_CALL(manager_, GetWorkerTaskRunner())
-        .WillRepeatedly(Return(message_loop_.task_runner()));
     // Use a low sample rate and large buffer size when testing otherwise the
     // FakeAudioOutputStream will keep the message loop busy indefinitely; i.e.,
     // RunUntilIdle() will never terminate.
     params_ = AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
                               CHANNEL_LAYOUT_STEREO, 8000, 16, 2048);
     InitDispatcher(base::TimeDelta::FromMilliseconds(kTestCloseDelayMs));
   }
 
   void TearDown() override {
     // This is necessary to free all proxy objects that have been
@@ skipping 566 matching lines @@
                   _)).WillOnce(Return(&real_stream));
 
   // Stream1 should be able to successfully open and start.
   EXPECT_CALL(real_stream, Open()).WillOnce(Return(true));
   proxy = new AudioOutputProxy(resampler_.get());
   EXPECT_TRUE(proxy->Open());
   CloseAndWaitForCloseTimer(proxy, &real_stream);
 }
 
 }  // namespace media