| Index: device/capture/video/video_capture_device_factory.cc
|
| diff --git a/media/capture/video/video_capture_device_factory.cc b/device/capture/video/video_capture_device_factory.cc
|
| similarity index 85%
|
| rename from media/capture/video/video_capture_device_factory.cc
|
| rename to device/capture/video/video_capture_device_factory.cc
|
| index adee43865fa7ad1d91d513c3526dbdb63b085de4..c5d954ed64b7c0158a69bb45bd8290d3e6d5e10a 100644
|
| --- a/media/capture/video/video_capture_device_factory.cc
|
| +++ b/device/capture/video/video_capture_device_factory.cc
|
| @@ -2,17 +2,17 @@
|
| // 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_factory.h"
|
| +#include "device/capture/video/video_capture_device_factory.h"
|
|
|
| #include <utility>
|
|
|
| #include "base/command_line.h"
|
| #include "build/build_config.h"
|
| +#include "device/capture/video/fake_video_capture_device_factory.h"
|
| +#include "device/capture/video/file_video_capture_device_factory.h"
|
| #include "media/base/media_switches.h"
|
| -#include "media/capture/video/fake_video_capture_device_factory.h"
|
| -#include "media/capture/video/file_video_capture_device_factory.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // static
|
| std::unique_ptr<VideoCaptureDeviceFactory>
|
| @@ -25,10 +25,10 @@ VideoCaptureDeviceFactory::CreateFactory(
|
| if (command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream)) {
|
| if (command_line->HasSwitch(switches::kUseFileForFakeVideoCapture)) {
|
| return std::unique_ptr<VideoCaptureDeviceFactory>(
|
| - new media::FileVideoCaptureDeviceFactory());
|
| + new FileVideoCaptureDeviceFactory());
|
| } else {
|
| return std::unique_ptr<VideoCaptureDeviceFactory>(
|
| - new media::FakeVideoCaptureDeviceFactory());
|
| + new FakeVideoCaptureDeviceFactory());
|
| }
|
| } else {
|
| // |ui_task_runner| is needed for the Linux ChromeOS factory to retrieve
|
| @@ -66,4 +66,4 @@ VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
|
| }
|
| #endif
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|