content/browser/renderer_host/media/video_capture_manager_unittest.cc - Issue 2410383002: VideoCapture: more migration IPC-->mojo, part 6

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_manager_unittest.cc

Issue 2410383002: VideoCapture: more migration IPC-->mojo, part 6 (Closed)

Patch Set: Comment correction Created 4 years, 2 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

« content/browser/renderer_host/media/video_capture_controller.cc ('K') | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | content/common/media/video_capture_messages.h » ('j') | services/video_capture/mojo_shared_memory_buffer_tracker.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2672608ab7f994f8071efaedfa5b970366e4be60..945cec8bdcf76cc3fcaafc2bdee97b097fb352ca 100644

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

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

@@ -138,7 +138,7 @@ class MockFrameObserver : public VideoCaptureControllerEventHandler {

MOCK_METHOD1(OnError, void(VideoCaptureControllerID id));

void OnBufferCreated(VideoCaptureControllerID id,

- base::SharedMemoryHandle handle,

+ mojo::ScopedSharedBufferHandle handle,

int length, int buffer_id) override {}

void OnBufferDestroyed(VideoCaptureControllerID id, int buffer_id) override {}

void OnBufferReady(VideoCaptureControllerID id,

@@ -219,7 +219,6 @@ class VideoCaptureManagerTest : public testing::Test {

vcm_->StartCaptureForClient(

session_id,

params,

- base::kNullProcessHandle,

client_id,

frame_observer_.get(),

base::Bind(&VideoCaptureManagerTest::OnGotControllerCallback,