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_input_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_input_renderer_host_unittest.cc')
| -rw-r--r-- | chromium/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc b/chromium/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc index c441897609a..f6bc81fe894 100644 --- a/chromium/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc +++ b/chromium/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc @@ -116,7 +116,6 @@ class AudioInputRendererHostWithInterception : public AudioInputRendererHost { private: bool Send(IPC::Message* message) override { - DCHECK_CURRENTLY_ON(BrowserThread::IO); bool handled = true; IPC_BEGIN_MESSAGE_MAP(AudioInputRendererHostWithInterception, *message) @@ -270,8 +269,8 @@ class AudioInputRendererHostTest : public testing::Test { audio_manager_.reset(new media::FakeAudioManager( base::MakeUnique<media::TestAudioThread>(), &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()); airh_ = new AudioInputRendererHostWithInterception( kRenderProcessId, kRendererPid, media::AudioManager::Get(), media_stream_manager_.get(), AudioMirroringManager::GetInstance(), @@ -552,8 +551,8 @@ TEST_F(AudioInputRendererHostTest, TabCaptureStream) { controls.audio.stream_source = kMediaStreamSourceTab; std::string request_label = media_stream_manager_->MakeMediaAccessRequest( kRenderProcessId, kRenderFrameId, 0, controls, SecurityOrigin(), - base::Bind([](const MediaStreamDevices& devices, - std::unique_ptr<MediaStreamUIProxy>) {})); + base::BindOnce([](const MediaStreamDevices& devices, + std::unique_ptr<MediaStreamUIProxy>) {})); base::RunLoop().RunUntilIdle(); int session_id = Open("Tab capture", controls.audio.device_id); |