Revert of [Mojo Video Capture] Introduce abstraction VideoCaptureSystem

content/browser/renderer_host/media/video_capture_manager_unittest.cc

Index: content/browser/renderer_host/media/video_capture_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
index e4c9ff78e7e2849f8690548f53be732bd9eed458..778b906072a03443890e3cb2a53e69ba3fb0f3e7 100644
--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -24,7 +24,6 @@
 #include "content/common/media/media_stream_options.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "media/capture/video/fake_video_capture_device_factory.h"
-#include "media/capture/video/video_capture_system.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -197,13 +196,12 @@
  protected:
   void SetUp() override {
     listener_.reset(new MockMediaStreamProviderListener());
-    auto video_capture_device_factory =
-        base::MakeUnique<WrappedDeviceFactory>();
-    video_capture_device_factory_ = video_capture_device_factory.get();
-    auto video_capture_system = base::MakeUnique<media::VideoCaptureSystem>(
-        std::move(video_capture_device_factory));
-    vcm_ = new VideoCaptureManager(std::move(video_capture_system),
-                                   base::ThreadTaskRunnerHandle::Get());
+    vcm_ = new VideoCaptureManager(
+        std::unique_ptr<media::VideoCaptureDeviceFactory>(
+            new WrappedDeviceFactory()),
+        base::ThreadTaskRunnerHandle::Get());
+    video_capture_device_factory_ = static_cast<WrappedDeviceFactory*>(
+        vcm_->video_capture_device_factory());
     const int32_t kNumberOfFakeDevices = 2;
     video_capture_device_factory_->SetToDefaultDevicesConfig(
         kNumberOfFakeDevices);