content/browser/renderer_host/media/video_capture_controller_unittest.cc - Issue 17846002: Refactor the VideoCaptureDevice::Name struct.

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 17846002: Refactor the VideoCaptureDevice::Name struct. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 7 years, 6 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/screen_capture_device.cc ('k') | content/browser/renderer_host/media/video_capture_manager.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 bc67fe4022f191109f847d34087683ceabc6acd9..0b334e0bbaa84952a2bb16ac363ce9baa55cad82 100644

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

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

@@ -100,12 +100,10 @@ class MockVideoCaptureControllerEventHandler

class MockVideoCaptureManager : public VideoCaptureManager {

public:

MockVideoCaptureManager()

- : video_session_id_(kStartOpenSessionId) {}

+ : video_session_id_(kStartOpenSessionId),

+ device_name_("fake_device_0", "/dev/video0") {}

void Init() {

- device_name_.unique_id = "/dev/video0";

- device_name_.device_name = "fake_device_0";

video_capture_device_.reset(

media::FakeVideoCaptureDevice::Create(device_name_));

ASSERT_TRUE(video_capture_device_.get() != NULL);