media/video/capture/video_capture_device_unittest.cc - Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

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: media/video/capture/video_capture_device_unittest.cc

Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: rebased code and addressed scherkus's comments Created 8 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

« content/browser/renderer_host/media/media_stream_device_settings.h ('K') | « media/video/capture/video_capture_device.h ('k') | media/video/capture/video_capture_types.h » ('j') | media/video/capture/win/sink_input_pin_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/video_capture_device_unittest.cc

diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc

index 15242044ad6f63be11b9c75de009046af8fd3efa..5ad9b26ba5444f5fa05b0d0f23e9e97e279fe73f 100644

--- a/media/video/capture/video_capture_device_unittest.cc

+++ b/media/video/capture/video_capture_device_unittest.cc

@@ -39,7 +39,7 @@ class MockFrameObserver : public media::VideoCaptureDevice::EventHandler {

}

virtual void OnFrameInfo(

- const VideoCaptureDevice::Capability& info) OVERRIDE {

+ const VideoCaptureCapability& info) OVERRIDE {

OnFrameInfo(info.width, info.height, info.frame_rate);

}