diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/mirroring/browser | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/mirroring/browser')
| -rw-r--r-- | chromium/components/mirroring/browser/cast_remoting_sender.cc | 5 | ||||
| -rw-r--r-- | chromium/components/mirroring/browser/single_client_video_capture_host_unittest.cc | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/chromium/components/mirroring/browser/cast_remoting_sender.cc b/chromium/components/mirroring/browser/cast_remoting_sender.cc index e069a9ca5eb..217ce0e3d2a 100644 --- a/chromium/components/mirroring/browser/cast_remoting_sender.cc +++ b/chromium/components/mirroring/browser/cast_remoting_sender.cc @@ -14,7 +14,6 @@ #include "base/lazy_instance.h" #include "base/numerics/safe_conversions.h" #include "base/stl_util.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" #include "base/trace_event/trace_event.h" @@ -134,8 +133,8 @@ void CastRemotingSender::FindAndBind( // CastRemotingSender lives entirely on the IO thread, so trampoline if // necessary. if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + content::GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( &CastRemotingSender::FindAndBind, rtp_stream_id, std::move(pipe), std::move(stream_sender), diff --git a/chromium/components/mirroring/browser/single_client_video_capture_host_unittest.cc b/chromium/components/mirroring/browser/single_client_video_capture_host_unittest.cc index e4db1cbf6b5..a370fbdf678 100644 --- a/chromium/components/mirroring/browser/single_client_video_capture_host_unittest.cc +++ b/chromium/components/mirroring/browser/single_client_video_capture_host_unittest.cc @@ -161,9 +161,9 @@ class MockVideoCaptureObserver final media::mojom::VideoFrameInfoPtr GetVideoFrameInfo() { return media::mojom::VideoFrameInfo::New( - base::TimeDelta(), base::Value(base::Value::Type::DICTIONARY), - media::PIXEL_FORMAT_I420, gfx::Size(320, 180), gfx::Rect(320, 180), - gfx::ColorSpace::CreateREC709(), nullptr); + base::TimeDelta(), media::VideoFrameMetadata(), media::PIXEL_FORMAT_I420, + gfx::Size(320, 180), gfx::Rect(320, 180), gfx::ColorSpace::CreateREC709(), + nullptr); } } // namespace @@ -187,8 +187,8 @@ class SingleClientVideoCaptureHostTest : public ::testing::Test { run_loop.Run(); // The video capture device is launched. - EXPECT_TRUE(!!launched_device_); - EXPECT_TRUE(!!frame_receiver_); + EXPECT_TRUE(launched_device_); + EXPECT_TRUE(frame_receiver_); } ~SingleClientVideoCaptureHostTest() override { |