content/browser/renderer_host/media/video_capture_manager_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: content/browser/renderer_host/media/video_capture_manager_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') | « content/browser/renderer_host/media/video_capture_controller.cc ('k') | content/renderer/media/capture_video_decoder.cc » ('j') | media/video/capture/win/sink_input_pin_win.h » ('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 8fc88833d9d0a7d695d5178cc77be40c9832fae3..9b18576af8ef152ecb657d3ec29164196646977a 100644

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

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

@@ -65,7 +65,7 @@ namespace {

class MockFrameObserver: public media::VideoCaptureDevice::EventHandler {

public:

virtual void OnError() {}

- void OnFrameInfo(const media::VideoCaptureDevice::Capability& info) {}

+ void OnFrameInfo(const media::VideoCaptureCapability& info) {}

virtual void OnIncomingCapturedFrame(const uint8* data, int length,

base::Time timestamp) {}

};