| Index: media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
|
| diff --git a/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm b/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
|
| index 6b8500d7bba0e3664739e2b50511cb0363ef6c41..4304ce60b344d7ad98219f64964f9c44e4b7ba06 100644
|
| --- a/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
|
| +++ b/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
|
| @@ -1,36 +1,16 @@
|
| // Copyright 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| -
|
| -#include "base/command_line.h"
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "base/thread_task_runner_handle.h"
|
| #import "media/base/mac/avfoundation_glue.h"
|
| -#include "media/base/media_switches.h"
|
| #include "media/capture/video/mac/video_capture_device_factory_mac.h"
|
| #include "media/capture/video/mac/video_capture_device_mac.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace media {
|
|
|
| -class VideoCaptureDeviceFactoryMacTest : public testing::Test {
|
| - void SetUp() override {
|
| - AVFoundationGlue::InitializeAVFoundation();
|
| - base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kEnableAVFoundation);
|
| - }
|
| -
|
| - private:
|
| - base::MessageLoop message_loop_;
|
| -};
|
| -
|
| -TEST_F(VideoCaptureDeviceFactoryMacTest, ListDevicesAVFoundation) {
|
| - if (!AVFoundationGlue::IsAVFoundationSupported()) {
|
| - DVLOG(1) << "AVFoundation not supported, skipping test.";
|
| - return;
|
| - }
|
| - VideoCaptureDeviceFactoryMac video_capture_device_factory(
|
| - base::ThreadTaskRunnerHandle::Get());
|
| +TEST(VideoCaptureDeviceFactoryMacTest, ListDevicesAVFoundation) {
|
| + AVFoundationGlue::InitializeAVFoundation();
|
| + VideoCaptureDeviceFactoryMac video_capture_device_factory;
|
|
|
| VideoCaptureDevice::Names names;
|
| video_capture_device_factory.GetDeviceNames(&names);
|
| @@ -38,7 +18,6 @@ TEST_F(VideoCaptureDeviceFactoryMacTest, ListDevicesAVFoundation) {
|
| DVLOG(1) << "No camera available. Exiting test.";
|
| return;
|
| }
|
| - // There should be no blacklisted devices, i.e. QTKit.
|
| std::string device_vid;
|
| for (VideoCaptureDevice::Names::const_iterator it = names.begin();
|
| it != names.end(); ++it) {
|
|
|