| Index: content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc
|
| diff --git a/content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc b/content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc
|
| index c84a6845b0a08445398d9ea204fcca5179a07d30..f84f87e2bd0ad62bde2f114b1a7332f9d8e490a2 100644
|
| --- a/content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc
|
| +++ b/content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc
|
| @@ -12,6 +12,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/run_loop.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| @@ -30,10 +31,7 @@
|
| class MockAudioManager : public media::FakeAudioManager {
|
| public:
|
| MockAudioManager(size_t num_devices)
|
| - : FakeAudioManager(base::ThreadTaskRunnerHandle::Get(),
|
| - base::ThreadTaskRunnerHandle::Get(),
|
| - &fake_audio_log_factory_),
|
| - num_devices_(num_devices) {}
|
| + : FakeAudioManager(&fake_audio_log_factory_), num_devices_(num_devices) {}
|
| MockAudioManager() : MockAudioManager(0) {}
|
| ~MockAudioManager() override {}
|
|
|
| @@ -83,7 +81,9 @@
|
|
|
| class AudioOutputDeviceEnumeratorTest : public ::testing::Test {
|
| public:
|
| - AudioOutputDeviceEnumeratorTest() {}
|
| + AudioOutputDeviceEnumeratorTest()
|
| + : thread_bundle_(), task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
|
| +
|
| ~AudioOutputDeviceEnumeratorTest() override {}
|
|
|
| MOCK_METHOD1(MockCallback, void(const AudioOutputDeviceEnumeration&));
|
| @@ -110,19 +110,18 @@
|
| const AudioOutputDeviceEnumeration& result) {
|
| EXPECT_EQ(actual_devices_expected, result.has_actual_devices);
|
| EXPECT_EQ(num_entries_expected, result.devices.size());
|
| - base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
|
| - run_loop_.QuitClosure());
|
| + task_runner_->PostTask(FROM_HERE, run_loop_.QuitClosure());
|
| }
|
|
|
| void QuitCallback(const AudioOutputDeviceEnumeration& result) {
|
| MockCallback(result);
|
| - base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
|
| - run_loop_.QuitClosure());
|
| + task_runner_->PostTask(FROM_HERE, run_loop_.QuitClosure());
|
| }
|
|
|
| protected:
|
| + std::unique_ptr<MockAudioManager> audio_manager_;
|
| TestBrowserThreadBundle thread_bundle_;
|
| - std::unique_ptr<MockAudioManager, media::AudioManagerDeleter> audio_manager_;
|
| + scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| base::RunLoop run_loop_;
|
|
|
| private:
|
|
|