Revert of [Mojo Video Capture] Decouple VCController from VCBufferPool and VCDeviceClient

content/browser/renderer_host/media/video_capture_device_client_unittest.cc

 // Copyright 2015 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 "media/capture/video/video_capture_device_client.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
-#include "content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h"
-#include "content/browser/renderer_host/media/video_frame_receiver_on_io_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "media/base/limits.h"
-#include "media/capture/video/video_capture_buffer_pool_impl.h"
-#include "media/capture/video/video_capture_buffer_tracker_factory_impl.h"
+#include "media/capture/video/video_capture_buffer_pool.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::Mock;
 using ::testing::InSequence;
 using ::testing::SaveArg;
 
 namespace content {
 
 namespace {
 
 class MockVideoCaptureController : public VideoCaptureController {
  public:
-  explicit MockVideoCaptureController() : VideoCaptureController() {}
+  explicit MockVideoCaptureController(int max_buffers)
+      : VideoCaptureController(max_buffers) {}
   ~MockVideoCaptureController() override {}
 
   MOCK_METHOD1(MockOnIncomingCapturedVideoFrame, void(const gfx::Size&));
   MOCK_METHOD0(OnError, void());
   MOCK_METHOD1(OnLog, void(const std::string& message));
   MOCK_METHOD1(OnBufferDestroyed, void(int buffer_id_to_drop));
 
   void OnIncomingCapturedVideoFrame(
       std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
       scoped_refptr<media::VideoFrame> frame) override {
     MockOnIncomingCapturedVideoFrame(frame->coded_size());
   }
 };
 
-std::unique_ptr<media::VideoCaptureJpegDecoder> CreateGpuJpegDecoder(
-    const media::VideoCaptureJpegDecoder::DecodeDoneCB& decode_done_cb) {
-  return base::MakeUnique<content::VideoCaptureGpuJpegDecoder>(decode_done_cb);
-}
-
 // Note that this test does not exercise the class VideoCaptureDeviceClient
 // in isolation. The "unit under test" is an instance of
 // VideoCaptureDeviceClient with some context that is specific to
 // renderer_host/media, and therefore this test must live here and not in
 // media/capture/video.
 class VideoCaptureDeviceClientTest : public ::testing::Test {
  public:
   VideoCaptureDeviceClientTest()
-      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {
-    scoped_refptr<media::VideoCaptureBufferPoolImpl> buffer_pool(
-        new media::VideoCaptureBufferPoolImpl(
-            base::MakeUnique<media::VideoCaptureBufferTrackerFactoryImpl>(),
-            1));
-    controller_ = base::MakeUnique<MockVideoCaptureController>();
-    device_client_ = base::MakeUnique<media::VideoCaptureDeviceClient>(
-        base::MakeUnique<VideoFrameReceiverOnIOThread>(
-            controller_->GetWeakPtrForIOThread()),
-        buffer_pool,
-        base::Bind(
-            &CreateGpuJpegDecoder,
-            base::Bind(&media::VideoFrameReceiver::OnIncomingCapturedVideoFrame,
-                       controller_->GetWeakPtrForIOThread())));
-  }
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
+        controller_(new MockVideoCaptureController(1)),
+        device_client_(controller_->NewDeviceClient()) {}
   ~VideoCaptureDeviceClientTest() override {}
 
   void TearDown() override { base::RunLoop().RunUntilIdle(); }
 
  protected:
   const content::TestBrowserThreadBundle thread_bundle_;
-  std::unique_ptr<MockVideoCaptureController> controller_;
-  std::unique_ptr<media::VideoCaptureDeviceClient> device_client_;
+  const std::unique_ptr<MockVideoCaptureController> controller_;
+  const std::unique_ptr<media::VideoCaptureDevice::Client> device_client_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceClientTest);
 };
 
 }  // namespace
 
 // A small test for reference and to verify VideoCaptureDeviceClient is
 // minimally functional.
 TEST_F(VideoCaptureDeviceClientTest, Minimal) {
@@ skipping 149 matching lines @@
 
     EXPECT_EQ(coded_size.width(), size_and_rotation.output_resolution.width());
     EXPECT_EQ(coded_size.height(),
               size_and_rotation.output_resolution.height());
 
     Mock::VerifyAndClearExpectations(controller_.get());
   }
 }
 
 }  // namespace content