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/content/browser/video_capture_service.cc | |
| 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/content/browser/video_capture_service.cc')
| -rw-r--r-- | chromium/content/browser/video_capture_service.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chromium/content/browser/video_capture_service.cc b/chromium/content/browser/video_capture_service.cc index 75652f93a8f..5bef30e3f57 100644 --- a/chromium/content/browser/video_capture_service.cc +++ b/chromium/content/browser/video_capture_service.cc @@ -5,11 +5,11 @@ #include "content/public/browser/video_capture_service.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequence_local_storage_slot.h" #include "base/time/time.h" #include "build/build_config.h" +#include "content/browser/service_sandbox_type.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/service_process_host.h" @@ -38,8 +38,7 @@ video_capture::mojom::VideoCaptureService* g_service_override = nullptr; void BindInProcessInstance( mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) { static base::NoDestructor<video_capture::VideoCaptureServiceImpl> service( - std::move(receiver), - base::CreateSingleThreadTaskRunner({BrowserThread::UI})); + std::move(receiver), GetUIThreadTaskRunner({})); } mojo::Remote<video_capture::mojom::VideoCaptureService>& GetUIThreadRemote() { @@ -85,9 +84,8 @@ video_capture::mojom::VideoCaptureService& GetVideoCaptureService() { storage; auto& remote = storage->GetOrCreateValue(); if (!remote.is_bound()) { - base::CreateSingleThreadTaskRunner({BrowserThread::UI}) - ->PostTask(FROM_HERE, - base::BindOnce(&BindProxyRemoteOnUIThread, + GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&BindProxyRemoteOnUIThread, remote.BindNewPipeAndPassReceiver())); } return *remote.get(); @@ -112,7 +110,6 @@ video_capture::mojom::VideoCaptureService& GetVideoCaptureService() { std::move(receiver), ServiceProcessHost::Options() .WithDisplayName("Video Capture") - .WithSandboxType(service_manager::SandboxType::kVideoCapture) #if defined(OS_MACOSX) // On Mac, the service requires a CFRunLoop which is provided by a // UI message loop. See https://crbug.com/834581. |