content/browser/renderer_host/media/video_capture_controller_unittest.cc - Issue 13616004: Switch event type when a capture device has been stopped from the render process. This make sure th…

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 13616004: Switch event type when a capture device has been stopped from the render process. This make sure th… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed code review comments. Created 7 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/video_capture_controller_event_handler.h ('k') | content/browser/renderer_host/media/video_capture_host.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 14c8da1343cbbebb8603e09f25ae085056f5ea0d..b4161bba661525c86ed614fec152fc968b97957d 100644

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

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

@@ -61,7 +61,7 @@ class MockVideoCaptureControllerEventHandler

MOCK_METHOD1(DoBufferCreated, void(const VideoCaptureControllerID&));

MOCK_METHOD1(DoBufferReady, void(const VideoCaptureControllerID&));

MOCK_METHOD1(DoFrameInfo, void(const VideoCaptureControllerID&));

- MOCK_METHOD1(DoPaused, void(const VideoCaptureControllerID&));

+ MOCK_METHOD1(DoEnded, void(const VideoCaptureControllerID&));

virtual void OnError(const VideoCaptureControllerID& id) OVERRIDE {}

virtual void OnBufferCreated(const VideoCaptureControllerID& id,

@@ -86,9 +86,9 @@ class MockVideoCaptureControllerEventHandler

EXPECT_EQ(id, controller_id_);

DoFrameInfo(id);

}

- virtual void OnPaused(const VideoCaptureControllerID& id) OVERRIDE {

+ virtual void OnEnded(const VideoCaptureControllerID& id) OVERRIDE {

EXPECT_EQ(id, controller_id_);

- DoPaused(id);

+ DoEnded(id);

}

scoped_refptr<VideoCaptureController> controller_;

@@ -240,7 +240,7 @@ TEST_F(VideoCaptureControllerTest, StopSession) {

vcm_->video_session_id_,

message_loop_.get()));

EXPECT_CALL(*controller_handler_,

- DoPaused(controller_handler_->controller_id_))

+ DoEnded(controller_handler_->controller_id_))

.Times(1);

controller_->StartCapture(controller_handler_->controller_id_,