content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc - Issue 1806313003: Pass task runners to AudioManager constructor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc

Issue 1806313003: Pass task runners to AudioManager constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: speculative hack to fix test timeouts Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/media/audio_output_device_enumerator.cc ('k') | content/browser/renderer_host/media/audio_renderer_host.cc » ('j') | media/audio/audio_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ac6140cbb0153b7201cebf06f2443c5798c68a30..bc69cc3d3b0b6f26baf1a80213b5a61a7ced8aff 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

@@ -30,7 +30,10 @@ namespace {

class MockAudioManager : public media::FakeAudioManager {

public:

MockAudioManager(size_t num_devices)

- : FakeAudioManager(&fake_audio_log_factory_), num_devices_(num_devices) {}

+ : FakeAudioManager(base::ThreadTaskRunnerHandle::Get(),

+ base::ThreadTaskRunnerHandle::Get(),

+ &fake_audio_log_factory_),

+ num_devices_(num_devices) {}

MockAudioManager() : MockAudioManager(0) {}

~MockAudioManager() override {}

@@ -118,7 +121,7 @@ class AudioOutputDeviceEnumeratorTest : public ::testing::Test {

}

protected:

- scoped_ptr<MockAudioManager> audio_manager_;

+ scoped_ptr<MockAudioManager, media::AudioManagerDeleter> audio_manager_;

TestBrowserThreadBundle thread_bundle_;

scoped_refptr<base::SingleThreadTaskRunner> task_runner_;

base::RunLoop run_loop_;