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

content/renderer/media/video_capture_impl_manager.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.
 //
 // Implementation notes about interactions with VideoCaptureImpl.
 //
 // How is VideoCaptureImpl used:
 //
 // VideoCaptureImpl is an IO thread object while VideoCaptureImplManager
 // lives only on the render thread. It is only possible to access an
@@ skipping 53 matching lines @@
       render_main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       is_suspending_all_(false),
       weak_factory_(this) {}
 
 VideoCaptureImplManager::~VideoCaptureImplManager() {
   DCHECK(render_main_task_runner_->BelongsToCurrentThread());
   if (devices_.empty())
     return;
   // Forcibly release all video capture resources.
   for (auto& entry : devices_) {
-    ChildProcess::current()->io_task_runner()->PostTask(
-        FROM_HERE, base::Bind(&VideoCaptureImpl::DeInit,
-                              base::Unretained(entry.impl.get())));
-    ChildProcess::current()->io_task_runner()->DeleteSoon(
-        FROM_HERE, entry.impl.release());
+    ChildProcess::current()->io_task_runner()->DeleteSoon(FROM_HERE,
+                                                          entry.impl.release());
   }
   devices_.clear();
 }
 
 base::Closure VideoCaptureImplManager::UseDevice(
     media::VideoCaptureSessionId id) {
   DCHECK(render_main_task_runner_->BelongsToCurrentThread());
   auto it = std::find_if(
       devices_.begin(), devices_.end(),
       [id] (const DeviceEntry& entry) { return entry.session_id == id; });
   if (it == devices_.end()) {
     devices_.push_back(DeviceEntry());
     it = devices_.end() - 1;
     it->session_id = id;
     it->impl = CreateVideoCaptureImplForTesting(id, filter_.get());
-    if (!it->impl)
-      it->impl.reset(new VideoCaptureImpl(id, filter_.get()));
-    ChildProcess::current()->io_task_runner()->PostTask(
-        FROM_HERE, base::Bind(&VideoCaptureImpl::Init,
-                              base::Unretained(it->impl.get())));
+    if (!it->impl) {
+      it->impl.reset(new VideoCaptureImpl(
+          id, filter_.get(), ChildProcess::current()->io_task_runner()));
+    }
   }
   ++it->client_count;
 
   // Design limit: When there are multiple clients, VideoCaptureImplManager
   // would have to individually track which ones requested suspending/resuming,
   // in order to determine whether the whole device should be suspended.
   // Instead, handle the non-common use case of multiple clients by just
   // resuming the suspended device, and disable suspend functionality while
   // there are multiple clients.
   if (it->is_individually_suspended)
@@ skipping 122 matching lines @@
     media::VideoCaptureSessionId id) {
   DCHECK(render_main_task_runner_->BelongsToCurrentThread());
   const auto it = std::find_if(
       devices_.begin(), devices_.end(),
       [id] (const DeviceEntry& entry) { return entry.session_id == id; });
   DCHECK(it != devices_.end());
   DCHECK_GT(it->client_count, 0);
   --it->client_count;
   if (it->client_count > 0)
     return;
-  ChildProcess::current()->io_task_runner()->PostTask(
-      FROM_HERE, base::Bind(&VideoCaptureImpl::DeInit,
-                            base::Unretained(it->impl.get())));
-  ChildProcess::current()->io_task_runner()->DeleteSoon(
-      FROM_HERE, it->impl.release());
+  ChildProcess::current()->io_task_runner()->DeleteSoon(FROM_HERE,
+                                                        it->impl.release());
   devices_.erase(it);
 }
 
 void VideoCaptureImplManager::SuspendDevices(bool suspend) {
   DCHECK(render_main_task_runner_->BelongsToCurrentThread());
   if (is_suspending_all_ == suspend)
     return;
   is_suspending_all_ = suspend;
   for (auto& entry : devices_) {
     if (entry.is_individually_suspended)
       continue;  // Either: 1) Already suspended; or 2) Should not be resumed.
     ChildProcess::current()->io_task_runner()->PostTask(
         FROM_HERE, base::Bind(&VideoCaptureImpl::SuspendCapture,
                               base::Unretained(entry.impl.get()), suspend));
   }
 }
 
 }  // namespace content