VideoCaptureImpl cleanup: merge ctor+Init() and DeInit()+dtor.

content/renderer/media/video_capture_impl.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.
 //
 // Notes about usage of this object by VideoCaptureImplManager.
 //
 // VideoCaptureImplManager access this object by using a Unretained()
 // binding and tasks on the IO thread. It is then important that
 // VideoCaptureImpl never post task to itself. All operations must be
 // synchronous.
@@ skipping 87 matching lines @@
   int32_t strides_[media::VideoFrame::kMaxPlanes];
 
   DISALLOW_COPY_AND_ASSIGN(ClientBuffer2);
 };
 
 VideoCaptureImpl::ClientInfo::ClientInfo() {}
 VideoCaptureImpl::ClientInfo::ClientInfo(const ClientInfo& other) = default;
 VideoCaptureImpl::ClientInfo::~ClientInfo() {}
 
 VideoCaptureImpl::VideoCaptureImpl(
-    const media::VideoCaptureSessionId session_id,
-    VideoCaptureMessageFilter* filter)
+    media::VideoCaptureSessionId session_id,
+    VideoCaptureMessageFilter* filter,
+    const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner)
     : message_filter_(filter),
       device_id_(0),
       session_id_(session_id),
       suspended_(false),
       state_(VIDEO_CAPTURE_STATE_STOPPED),
+      io_task_runner_(io_task_runner),
       weak_factory_(this) {
   DCHECK(filter);
+  io_task_runner_->PostTask(FROM_HERE,
+                            base::Bind(&VideoCaptureMessageFilter::AddDelegate,
+                                       message_filter_, this));
+  //  message_filter_->AddDelegate(this);

[chfremer, 2016/09/28 23:28:09]

Can be removed?

[mcasas, 2016/09/28 23:49:52]

oops, yeah, done.

 }
 
 VideoCaptureImpl::~VideoCaptureImpl() {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
-}
-
-void VideoCaptureImpl::Init() {
-  // For creating callbacks in unittest, this class may be constructed from a
-  // different thread than the IO thread, e.g. wherever unittest runs on.
-  // Therefore, this function should define the thread ownership.
-#if DCHECK_IS_ON()
-  io_task_runner_ = base::ThreadTaskRunnerHandle::Get();
-#endif
-  message_filter_->AddDelegate(this);
-}
-
-void VideoCaptureImpl::DeInit() {
-  DCHECK(io_task_runner_->BelongsToCurrentThread());
   if (state_ == VIDEO_CAPTURE_STATE_STARTED)
     Send(new VideoCaptureHostMsg_Stop(device_id_));
   message_filter_->RemoveDelegate(this);
 }
 
 void VideoCaptureImpl::SuspendCapture(bool suspend) {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
   Send(suspend ? static_cast<IPC::Message*>(
                      new VideoCaptureHostMsg_Pause(device_id_))
                : static_cast<IPC::Message*>(new VideoCaptureHostMsg_Resume(
@@ skipping 425 matching lines @@
   double consumer_resource_utilization = -1.0;
   if (!metadata->GetDouble(media::VideoFrameMetadata::RESOURCE_UTILIZATION,
                            &consumer_resource_utilization)) {
     consumer_resource_utilization = -1.0;
   }
 
   callback_to_io_thread.Run(*release_sync_token, consumer_resource_utilization);
 }
 
 }  // namespace content