device/capture/video/video_capture_device_unittest.cc - Issue 2143903003: [WIP] Move media/capture to device/capture

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: device/capture/video/video_capture_device_unittest.cc

Issue 2143903003: [WIP] Move media/capture to device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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

Index: device/capture/video/video_capture_device_unittest.cc

diff --git a/media/capture/video/video_capture_device_unittest.cc b/device/capture/video/video_capture_device_unittest.cc

similarity index 98%

rename from media/capture/video/video_capture_device_unittest.cc

rename to device/capture/video/video_capture_device_unittest.cc

index e71fb71efaff8ef75746e325a41f030adf5c5cf8..35b345c89e3af8b2784b93ebfa3b89da73e91c95 100644

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

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

@@ -2,7 +2,7 @@

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

// found in the LICENSE file.

-#include "media/capture/video/video_capture_device.h"

+#include "device/capture/video/video_capture_device.h"

#include <stddef.h>

#include <stdint.h>

@@ -19,26 +19,26 @@

#include "base/threading/thread.h"

#include "base/threading/thread_task_runner_handle.h"

#include "build/build_config.h"

+#include "device/capture/video/video_capture_device_factory.h"

#include "media/base/bind_to_current_loop.h"

#include "media/base/video_capture_types.h"

-#include "media/capture/video/video_capture_device_factory.h"

#include "testing/gmock/include/gmock/gmock.h"

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

#if defined(OS_WIN)

#include "base/win/scoped_com_initializer.h"

#include "base/win/windows_version.h" // For fine-grained suppression.

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

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

#endif

#if defined(OS_MACOSX)

+#include "device/capture/video/mac/video_capture_device_factory_mac.h"

#include "media/base/mac/avfoundation_glue.h"

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

#endif

#if defined(OS_ANDROID)

#include "base/android/jni_android.h"

-#include "media/capture/video/android/video_capture_device_android.h"

+#include "device/capture/video/android/video_capture_device_android.h"

#endif

#if defined(OS_MACOSX)

« no previous file with comments | « device/capture/video/video_capture_device_info.cc ('k') | device/capture/video/win/capability_list_win.h » ('j') | no next file with comments »