media/video/capture/mac/video_capture_device_factory_mac_unittest.mm - Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: media/video/capture/mac/video_capture_device_factory_mac_unittest.mm

Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move media glue code back to base/mac and add suitable rules in build files to compile the code for… Created 6 years, 3 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 unified diff | Download patch

« media/media.gyp ('K') | « media/video/capture/mac/video_capture_device_factory_mac.mm ('k') | media/video/capture/mac/video_capture_device_mac.mm » ('j') | media/video/capture/mac/video_capture_device_mac.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/message_loop/message_loop_proxy.h"	6 #include "base/message_loop/message_loop_proxy.h"

	7 #import "media/base/mac/avfoundation_glue.h"

7 #include "media/base/media_switches.h"	8 #include "media/base/media_switches.h"

8 #import "media/video/capture/mac/avfoundation_glue.h"

9 #include "media/video/capture/mac/video_capture_device_factory_mac.h"	9 #include "media/video/capture/mac/video_capture_device_factory_mac.h"

10 #include "media/video/capture/mac/video_capture_device_mac.h"	10 #include "media/video/capture/mac/video_capture_device_mac.h"

11 #include "testing/gtest/include/gtest/gtest.h"	11 #include "testing/gtest/include/gtest/gtest.h"

12	12

13 namespace media {	13 namespace media {

14	14

15 class VideoCaptureDeviceFactoryMacTest : public testing::Test {	15 class VideoCaptureDeviceFactoryMacTest : public testing::Test {

16 virtual void SetUp() {	16 virtual void SetUp() {

17 CommandLine::ForCurrentProcess()->AppendSwitch(	17 CommandLine::ForCurrentProcess()->AppendSwitch(

18 switches::kEnableAVFoundation);	18 switches::kEnableAVFoundation);

(...skipping 16 matching lines...) Expand all Loading...
35 }	35 }

36 // There should be no blacklisted devices, i.e. QTKit.	36 // There should be no blacklisted devices, i.e. QTKit.

37 std::string device_vid;	37 std::string device_vid;

38 for (VideoCaptureDevice::Names::const_iterator it = names.begin();	38 for (VideoCaptureDevice::Names::const_iterator it = names.begin();

39 it != names.end(); ++it) {	39 it != names.end(); ++it) {

40 EXPECT_EQ(it->capture_api_type(), VideoCaptureDevice::Name::AVFOUNDATION);	40 EXPECT_EQ(it->capture_api_type(), VideoCaptureDevice::Name::AVFOUNDATION);

41 }	41 }

42 }	42 }

43	43

44 }; // namespace media	44 }; // namespace media

OLD	NEW