Revert of [Mojo Video Capture] Adapt video_capture service to refactored video capture stack

services/video_capture/service_impl.cc

 // Copyright 2016 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 "services/video_capture/service_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "media/capture/video/fake_video_capture_device_factory.h"
 #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"
 
 namespace {
 
 // TODO(chfremer): Replace with an actual decoder factory.
 // https://crbug.com/584797
 std::unique_ptr<media::VideoCaptureJpegDecoder> CreateJpegDecoder() {
   return nullptr;
 }
@@ skipping 35 matching lines @@
 
 void ServiceImpl::LazyInitializeDeviceFactory() {
   if (device_factory_)
     return;
 
   // Create the platform-specific device factory.
   // Task runner does not seem to actually be used.
   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