Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1781)

Unified Diff: content/browser/renderer_host/media/media_stream_manager_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
Index: content/browser/renderer_host/media/media_stream_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager_unittest.cc b/content/browser/renderer_host/media/media_stream_manager_unittest.cc
index a48700a878193deea270f5085d574dc358a4f826..d2d923329d93f890940820db7a53d5b0bc56c860 100644
--- a/content/browser/renderer_host/media/media_stream_manager_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_manager_unittest.cc
@@ -71,7 +71,9 @@ ResourceContext::SaltCallback GetMockSaltCallback() {
class MockAudioManager : public AudioManagerPlatform {
public:
MockAudioManager()
- : AudioManagerPlatform(&fake_audio_log_factory_),
+ : AudioManagerPlatform(base::ThreadTaskRunnerHandle::Get(),
+ base::ThreadTaskRunnerHandle::Get(),
+ &fake_audio_log_factory_),
num_output_devices_(2) {}
~MockAudioManager() override {}
@@ -210,7 +212,7 @@ class MediaStreamManagerTest : public ::testing::Test {
security_origin, callback);
}
- scoped_ptr<MockAudioManager> audio_manager_;
+ scoped_ptr<MockAudioManager, media::AudioManagerDeleter> audio_manager_;
scoped_ptr<MediaStreamManager> media_stream_manager_;
content::TestBrowserThreadBundle thread_bundle_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;

Powered by Google App Engine
This is Rietveld 408576698