Revert of [Mojo Video Capture] Introduce abstraction VideoCaptureSystem

content/browser/renderer_host/media/video_capture_manager_unittest.cc

 // Copyright (c) 2012 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.
 
 // Unit test for VideoCaptureManager.
 
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/renderer_host/media/media_stream_provider.h"
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #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"
 
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::InvokeWithoutArgs;
 using ::testing::Return;
 using ::testing::SaveArg;
@@ skipping 152 matching lines @@
       devices.emplace_back(MEDIA_DEVICE_VIDEO_CAPTURE,
                            descriptor.GetNameAndModel(), descriptor.device_id);
     }
     devices_ = std::move(devices);
     quit_closure.Run();
   }
 
  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);
     vcm_->RegisterListener(listener_.get());
     frame_observer_.reset(new MockFrameObserver());
 
     base::RunLoop run_loop;
     vcm_->EnumerateDevices(
         base::Bind(&VideoCaptureManagerTest::HandleEnumerationResult,
                    base::Unretained(this), run_loop.QuitClosure()));
@@ skipping 570 matching lines @@
   // Wait to check callbacks before removing the listener.
   base::RunLoop().RunUntilIdle();
   vcm_->UnregisterListener(listener_.get());
 }
 #endif
 
 // TODO(mcasas): Add a test to check consolidation of the supported formats
 // provided by the device when http://crbug.com/323913 is closed.
 
 }  // namespace content