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

Unified Diff: content/browser/renderer_host/media/video_capture_host_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/video_capture_host_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index b1d991a95fe3fe7d5e8430685c5fcbfc58b1039d..3c15e1130a215466af838b235c309bdee9d93ce7 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -273,7 +273,7 @@ class VideoCaptureHostTest : public testing::Test {
#endif
// Create our own MediaStreamManager.
- audio_manager_.reset(media::AudioManager::CreateForTesting());
+ audio_manager_ = media::AudioManager::CreateForTesting(task_runner_);
#ifndef TEST_REAL_CAPTURE_DEVICE
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kUseFakeDeviceForMediaStream);
@@ -483,7 +483,7 @@ class VideoCaptureHostTest : public testing::Test {
private:
StrictMock<MockMediaStreamRequester> stream_requester_;
- scoped_ptr<media::AudioManager> audio_manager_;
+ media::ScopedAudioManagerPtr audio_manager_;
scoped_ptr<MediaStreamManager> media_stream_manager_;
content::TestBrowserThreadBundle thread_bundle_;
content::TestBrowserContext browser_context_;

Powered by Google App Engine
This is Rietveld 408576698