diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/content/browser/renderer_host/media/audio_renderer_host_unittest.cc | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
| download | qtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content/browser/renderer_host/media/audio_renderer_host_unittest.cc')
| -rw-r--r-- | chromium/content/browser/renderer_host/media/audio_renderer_host_unittest.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chromium/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/chromium/content/browser/renderer_host/media/audio_renderer_host_unittest.cc index 91888375f02..ab76c47aead 100644 --- a/chromium/content/browser/renderer_host/media/audio_renderer_host_unittest.cc +++ b/chromium/content/browser/renderer_host/media/audio_renderer_host_unittest.cc @@ -206,12 +206,16 @@ class AudioRendererHostTest : public RenderViewHostTestHarness { void SetUp() override { base::CommandLine::ForCurrentProcess()->AppendSwitch( switches::kUseFakeDeviceForMediaStream); + // MediaStreamManager depends on legacy TestBrowserThreadBundle behavior. + // TODO: Remove once MediaStreamManager is ported to TaskScheduler. + DisableScopedTaskEnvironment(); + RenderViewHostTestHarness::SetUp(); audio_manager_ = base::MakeUnique<FakeAudioManagerWithAssociations>(&log_factory_); audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); - media_stream_manager_ = - base::MakeUnique<MediaStreamManager>(audio_system_.get()); + media_stream_manager_ = base::MakeUnique<MediaStreamManager>( + audio_system_.get(), audio_manager_->GetTaskRunner()); auth_run_loop_ = base::MakeUnique<base::RunLoop>(); host_ = base::MakeRefCounted<MockAudioRendererHost>( auth_run_loop_.get(), process()->GetID(), audio_manager_.get(), |