| Index: services/video_capture/service_impl.cc
|
| diff --git a/services/video_capture/service_impl.cc b/services/video_capture/service_impl.cc
|
| index cb1b98d9578e46bc5bbf4a423bca9f6b24b71a80..bd3d05017daf7284a88fa24e79f4bd23b9ae6352 100644
|
| --- a/services/video_capture/service_impl.cc
|
| +++ b/services/video_capture/service_impl.cc
|
| @@ -10,7 +10,6 @@
|
| #include "media/capture/video/video_capture_buffer_pool.h"
|
| #include "media/capture/video/video_capture_buffer_tracker.h"
|
| #include "media/capture/video/video_capture_jpeg_decoder.h"
|
| -#include "media/capture/video/video_capture_system_impl.h"
|
| #include "services/service_manager/public/cpp/service_info.h"
|
| #include "services/video_capture/device_factory_media_to_mojo_adapter.h"
|
|
|
| @@ -66,23 +65,18 @@
|
| std::unique_ptr<media::VideoCaptureDeviceFactory> media_device_factory =
|
| media::VideoCaptureDeviceFactory::CreateFactory(
|
| base::MessageLoop::current()->task_runner());
|
| - auto video_capture_system = base::MakeUnique<media::VideoCaptureSystemImpl>(
|
| - std::move(media_device_factory));
|
|
|
| device_factory_ = base::MakeUnique<DeviceFactoryMediaToMojoAdapter>(
|
| - std::move(video_capture_system), base::Bind(CreateJpegDecoder));
|
| + std::move(media_device_factory), base::Bind(CreateJpegDecoder));
|
| }
|
|
|
| void ServiceImpl::LazyInitializeFakeDeviceFactory() {
|
| if (fake_device_factory_)
|
| return;
|
|
|
| - auto factory = base::MakeUnique<media::FakeVideoCaptureDeviceFactory>();
|
| - auto video_capture_system =
|
| - base::MakeUnique<media::VideoCaptureSystemImpl>(std::move(factory));
|
| -
|
| fake_device_factory_ = base::MakeUnique<DeviceFactoryMediaToMojoAdapter>(
|
| - std::move(video_capture_system), base::Bind(&CreateJpegDecoder));
|
| + base::MakeUnique<media::FakeVideoCaptureDeviceFactory>(),
|
| + base::Bind(&CreateJpegDecoder));
|
| }
|
|
|
| } // namespace video_capture
|
|
|