| Index: content/browser/renderer_host/media/video_capture_manager.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
|
| index 2118857ecee7866c2e984854298eaee4c37e217e..e3ef68a0a9e5efc8dc90624dc17a56dec829fc5a 100644
|
| --- a/content/browser/renderer_host/media/video_capture_manager.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_manager.cc
|
| @@ -28,7 +28,6 @@
|
| #include "content/browser/renderer_host/media/video_capture_controller.h"
|
| #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
|
| #include "content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h"
|
| -#include "content/browser/renderer_host/media/video_frame_receiver_on_io_thread.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/desktop_media_id.h"
|
| #include "content/public/common/media_stream_request.h"
|
| @@ -40,6 +39,7 @@
|
| #include "media/capture/video/video_capture_device.h"
|
| #include "media/capture/video/video_capture_device_client.h"
|
| #include "media/capture/video/video_capture_device_factory.h"
|
| +#include "media/capture/video/video_frame_receiver_on_task_runner.h"
|
|
|
| #if defined(ENABLE_SCREEN_CAPTURE)
|
|
|
| @@ -265,8 +265,9 @@ VideoCaptureManager::DeviceEntry::CreateDeviceClient() {
|
| max_buffers);
|
|
|
| return base::MakeUnique<media::VideoCaptureDeviceClient>(
|
| - base::MakeUnique<VideoFrameReceiverOnIOThread>(
|
| - video_capture_controller.GetWeakPtrForIOThread()),
|
| + base::MakeUnique<media::VideoFrameReceiverOnTaskRunner>(
|
| + video_capture_controller.GetWeakPtrForIOThread(),
|
| + BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)),
|
| std::move(buffer_pool),
|
| base::Bind(&CreateGpuJpegDecoder,
|
| base::Bind(&media::VideoFrameReceiver::OnFrameReadyInBuffer,
|
|
|