Refactor code duplication by introducing make_unique at the constructor

stage of media::VideoCaptureBufferPoolImpl

Change-Id: I993f1527729b11a12909bf07a3a1d929289fbf3a
Bug: 781987
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2384035Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Palak Agarwal <agpalak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804162}

content/browser/renderer_host/media/fake_video_capture_device_launcher.cc

@@ -78,7 +78,6 @@ void FakeVideoCaptureDeviceLauncher::LaunchDeviceAsync(
   auto device = system_->CreateDevice(device_id);
   scoped_refptr<media::VideoCaptureBufferPool> buffer_pool(
       new media::VideoCaptureBufferPoolImpl(
-          std::make_unique<media::VideoCaptureBufferTrackerFactoryImpl>(),
           media::VideoCaptureBufferType::kSharedMemory, kMaxBufferCount));
 #if defined(OS_CHROMEOS)
   auto device_client = std::make_unique<media::VideoCaptureDeviceClient>(

content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc

@@ -248,7 +248,6 @@ InProcessVideoCaptureDeviceLauncher::CreateDeviceClient(
 
   scoped_refptr<media::VideoCaptureBufferPool> buffer_pool =
       new media::VideoCaptureBufferPoolImpl(
-          std::make_unique<media::VideoCaptureBufferTrackerFactoryImpl>(),
           requested_buffer_type, buffer_pool_max_buffer_count);
 
 #if defined(OS_CHROMEOS)

content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc

@@ -62,7 +62,6 @@ class VideoCaptureBufferPoolTest
   VideoCaptureBufferPoolTest()
       : expected_dropped_id_(0),
         pool_(new media::VideoCaptureBufferPoolImpl(
-            std::make_unique<media::VideoCaptureBufferTrackerFactoryImpl>(),
             media::VideoCaptureBufferType::kSharedMemory,
             kTestBufferPoolSize)) {}
 

content/browser/renderer_host/media/video_capture_controller_unittest.cc

@@ -177,7 +177,6 @@ class VideoCaptureControllerTest
 
   void InitializeNewDeviceClientAndBufferPoolInstances() {
     buffer_pool_ = new media::VideoCaptureBufferPoolImpl(
-        std::make_unique<media::VideoCaptureBufferTrackerFactoryImpl>(),
         media::VideoCaptureBufferType::kSharedMemory, kPoolSize);
 #if defined(OS_CHROMEOS)
     device_client_.reset(new media::VideoCaptureDeviceClient(

media/capture/video/video_capture_buffer_pool_impl.cc

@@ -12,18 +12,19 @@
 #include "build/build_config.h"
 #include "media/capture/video/video_capture_buffer_handle.h"
 #include "media/capture/video/video_capture_buffer_tracker.h"
+#include "media/capture/video/video_capture_buffer_tracker_factory_impl.h"
 #include "ui/gfx/buffer_format_util.h"
 
 namespace media {
 
 VideoCaptureBufferPoolImpl::VideoCaptureBufferPoolImpl(
-    std::unique_ptr<VideoCaptureBufferTrackerFactory> buffer_tracker_factory,
     VideoCaptureBufferType buffer_type,
     int count)
     : buffer_type_(buffer_type),
       count_(count),
       next_buffer_id_(0),
-      buffer_tracker_factory_(std::move(buffer_tracker_factory)) {
+      buffer_tracker_factory_(
+          std::make_unique<media::VideoCaptureBufferTrackerFactoryImpl>()) {
   DCHECK_GT(count, 0);
 }
 

media/capture/video/video_capture_buffer_pool_impl.h

@@ -30,7 +30,6 @@ class CAPTURE_EXPORT VideoCaptureBufferPoolImpl
     : public VideoCaptureBufferPool {
  public:
   explicit VideoCaptureBufferPoolImpl(
-      std::unique_ptr<VideoCaptureBufferTrackerFactory> buffer_tracker_factory,
       VideoCaptureBufferType buffer_type,
       int count);
 

media/capture/video/video_capture_device_client_unittest.cc

@@ -55,7 +55,6 @@ class VideoCaptureDeviceClientTest : public ::testing::Test {
   VideoCaptureDeviceClientTest() {
     scoped_refptr<VideoCaptureBufferPoolImpl> buffer_pool(
         new VideoCaptureBufferPoolImpl(
-            std::make_unique<VideoCaptureBufferTrackerFactoryImpl>(),
             VideoCaptureBufferType::kSharedMemory, 2));
     auto controller = std::make_unique<NiceMock<MockVideoFrameReceiver>>();
     receiver_ = controller.get();

services/video_capture/device_media_to_mojo_adapter.cc

@@ -91,11 +91,8 @@ void DeviceMediaToMojoAdapter::Start(
   }
 
   // Create a dedicated buffer pool for the device usage session.
-  auto buffer_tracker_factory =
-      std::make_unique<media::VideoCaptureBufferTrackerFactoryImpl>();
   scoped_refptr<media::VideoCaptureBufferPool> buffer_pool(
-      new media::VideoCaptureBufferPoolImpl(std::move(buffer_tracker_factory),
-                                            requested_settings.buffer_type,
+      new media::VideoCaptureBufferPoolImpl(requested_settings.buffer_type,
                                             max_buffer_pool_buffer_count()));
 #if defined(OS_CHROMEOS)
   auto device_client = std::make_unique<media::VideoCaptureDeviceClient>(

services/video_capture/shared_memory_virtual_device_mojo_adapter.cc

@@ -38,7 +38,6 @@ SharedMemoryVirtualDeviceMojoAdapter::SharedMemoryVirtualDeviceMojoAdapter(
       send_buffer_handles_to_producer_as_raw_file_descriptors_(
           send_buffer_handles_to_producer_as_raw_file_descriptors),
       buffer_pool_(new media::VideoCaptureBufferPoolImpl(
-          std::make_unique<media::VideoCaptureBufferTrackerFactoryImpl>(),
           media::VideoCaptureBufferType::kSharedMemory,
           max_buffer_pool_buffer_count())) {}