[Mojo Video Capture] Add support to BuildableVideoCaptureDevice for aborting the device start.

content/browser/renderer_host/media/video_capture_host.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.
 
 #include "content/browser/renderer_host/media/video_capture_host.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 21 matching lines @@
   mojo::MakeStrongBinding(
       base::MakeUnique<VideoCaptureHost>(media_stream_manager),
       std::move(request));
 }
 
 VideoCaptureHost::~VideoCaptureHost() {
   for (auto it = controllers_.begin(); it != controllers_.end(); ) {
     const base::WeakPtr<VideoCaptureController>& controller = it->second;
     if (controller) {
       const VideoCaptureControllerID controller_id(it->first);
-      media_stream_manager_->video_capture_manager()->StopCaptureForClient(
+      media_stream_manager_->video_capture_manager()->DisconnectClient(
           controller.get(), controller_id, this, false);
       ++it;
     } else {
       // Remove the entry for this controller_id so that when the controller
       // is added, the controller will be notified to stop for this client
       // in DoControllerAdded.
       controllers_.erase(it++);
     }
   }
 }
@@ skipping 82 matching lines @@
   device_id_to_observer_map_[device_id] = std::move(observer);
 
   const VideoCaptureControllerID controller_id(device_id);
   if (controllers_.find(controller_id) != controllers_.end()) {
     device_id_to_observer_map_[device_id]->OnStateChanged(
         mojom::VideoCaptureState::STARTED);
     return;
   }
 
   controllers_[controller_id] = base::WeakPtr<VideoCaptureController>();
-  media_stream_manager_->video_capture_manager()->StartCaptureForClient(
+  media_stream_manager_->video_capture_manager()->ConnectClient(
       session_id, params, controller_id, this,
       base::Bind(&VideoCaptureHost::OnControllerAdded,
                  weak_factory_.GetWeakPtr(), device_id));
 }
 
 void VideoCaptureHost::Stop(int32_t device_id) {
   DVLOG(1) << __func__ << " " << device_id;
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   VideoCaptureControllerID controller_id(device_id);
@@ skipping 132 matching lines @@
 }
 
 void VideoCaptureHost::OnControllerAdded(
     int device_id,
     const base::WeakPtr<VideoCaptureController>& controller) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   VideoCaptureControllerID controller_id(device_id);
   auto it = controllers_.find(controller_id);
   if (it == controllers_.end()) {
     if (controller) {
-      media_stream_manager_->video_capture_manager()->StopCaptureForClient(
+      media_stream_manager_->video_capture_manager()->DisconnectClient(
           controller.get(), controller_id, this, false);
     }
     return;
   }
 
   if (!controller) {
     if (base::ContainsKey(device_id_to_observer_map_, controller_id)) {
       device_id_to_observer_map_[device_id]->OnStateChanged(
           mojom::VideoCaptureState::FAILED);
     }
@@ skipping 11 matching lines @@
 
   auto it = controllers_.find(controller_id);
   if (it == controllers_.end())
     return;
 
   const base::WeakPtr<VideoCaptureController> controller = it->second;
   controllers_.erase(it);
   if (!controller)
     return;
 
-  media_stream_manager_->video_capture_manager()->StopCaptureForClient(
+  media_stream_manager_->video_capture_manager()->DisconnectClient(
       controller.get(), controller_id, this, on_error);
 }
 
 }  // namespace content