media/video/capture/video_capture_device_unittest.cc - Issue 276383002: VideoCaptureDeviceWin: Extract class-static method into a Factory (both MF/DS)

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 276383002: VideoCaptureDeviceWin: Extract class-static method into a Factory (both MF/DS) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 7 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 | « media/video/capture/video_capture_device_factory.cc ('k') | media/video/capture/win/video_capture_device_factory_win.h » ('j') | media/video/capture/win/video_capture_device_factory_win.cc » ('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 e897d20454251c80fb25a0f93e1014a50fce36a4..f0158db2e20258f7c766dc1af12ec0bf17969667 100644

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

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

@@ -15,7 +15,7 @@

#if defined(OS_WIN)

#include "base/win/scoped_com_initializer.h"

-#include "media/video/capture/win/video_capture_device_mf_win.h"

+#include "media/video/capture/win/video_capture_device_factory_win.h"

#endif

#if defined(OS_ANDROID)

@@ -164,7 +164,7 @@ class VideoCaptureDeviceTest : public testing::Test {

TEST_F(VideoCaptureDeviceTest, OpenInvalidDevice) {

#if defined(OS_WIN)

VideoCaptureDevice::Name::CaptureApiType api_type =

- VideoCaptureDeviceMFWin::PlatformSupported()

+ VideoCaptureDeviceFactoryWin::PlatformSupportsMediaFoundation()

? VideoCaptureDevice::Name::MEDIA_FOUNDATION

: VideoCaptureDevice::Name::DIRECT_SHOW;

VideoCaptureDevice::Name device_name("jibberish", "jibberish", api_type);