content/browser/renderer_host/media/video_capture_controller_unittest.cc - Issue 2795663002: Change VideoFrameReceiverOnIOThread to VideoFrameReceiverOnTaskRunner

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/video_capture_controller_unittest.cc

Issue 2795663002: Change VideoFrameReceiverOnIOThread to VideoFrameReceiverOnTaskRunner (Closed)

Patch Set: Rebase Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/media/in_process_buildable_video_capture_device.cc ('k') | content/browser/renderer_host/media/video_frame_receiver_on_io_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc

diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc

index 7a1c1c3b50710d79c6134a8c12df6b57411291ef..45f164fcc59d433325ef8f8cc5f3269a12377a86 100644

--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc

+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc

@@ -24,14 +24,15 @@

#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_capture_manager.h"

-#include "content/browser/renderer_host/media/video_frame_receiver_on_io_thread.h"

#include "content/common/media/media_stream_options.h"

+#include "content/public/browser/browser_thread.h"

#include "content/public/test/test_browser_thread_bundle.h"

#include "media/base/video_frame_metadata.h"

#include "media/base/video_util.h"

#include "media/capture/video/video_capture_buffer_pool_impl.h"

#include "media/capture/video/video_capture_buffer_tracker_factory_impl.h"

#include "media/capture/video/video_capture_device_client.h"

+#include "media/capture/video/video_frame_receiver_on_task_runner.h"

#include "media/capture/video_capture_types.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -191,8 +192,9 @@ class VideoCaptureControllerTest

base::MakeUnique<media::VideoCaptureBufferTrackerFactoryImpl>(),

kPoolSize);

device_client_.reset(new media::VideoCaptureDeviceClient(

- base::MakeUnique<VideoFrameReceiverOnIOThread>(

- controller_->GetWeakPtrForIOThread()),

+ base::MakeUnique<media::VideoFrameReceiverOnTaskRunner>(

+ controller_->GetWeakPtrForIOThread(),

+ BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)),

buffer_pool_,

base::Bind(&CreateGpuJpegDecoder,

base::Bind(&media::VideoFrameReceiver::OnFrameReadyInBuffer,