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

content/browser/renderer_host/media/video_capture_browsertest.cc

 // Copyright 2017 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 "base/command_line.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
@@ skipping 84 matching lines @@
     // VideoCaptureControllerEventHandler. To satisfy this, we have to post our
     // invocation to the end of the IO message queue.
     if (post_to_end_of_message_queue) {
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE,
           base::Bind(&VideoCaptureBrowserTest::TearDownCaptureDeviceOnIOThread,
                      base::Unretained(this), continuation, false));
       return;
     }
 
-    video_capture_manager_->StopCaptureForClient(
-        controller_.get(), stub_client_id_, &mock_controller_event_handler_,
-        false);
+    video_capture_manager_->DisconnectClient(controller_.get(), stub_client_id_,
+                                             &mock_controller_event_handler_,
+                                             false);
 
     EXPECT_CALL(mock_stream_provider_listener_, Closed(_, _))
         .WillOnce(InvokeWithoutArgs([continuation]() { continuation.Run(); }));
 
     video_capture_manager_->Close(session_id_);
   }
 
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchASCII(
@@ skipping 24 matching lines @@
     ASSERT_TRUE(GetParam().device_index_to_use < descriptors.size());
     const auto& descriptor = descriptors[GetParam().device_index_to_use];
     MediaStreamDevice media_stream_device(
         MEDIA_DEVICE_VIDEO_CAPTURE, descriptor.device_id,
         descriptor.display_name, descriptor.facing);
     session_id_ = video_capture_manager_->Open(media_stream_device);
     media::VideoCaptureParams capture_params;
     capture_params.requested_format = media::VideoCaptureFormat(
         GetParam().resolution_to_use, GetParam().frame_rate_to_use,
         GetParam().pixel_format_to_use);
-    video_capture_manager_->StartCaptureForClient(
+    video_capture_manager_->ConnectClient(
         session_id_, capture_params, stub_client_id_,
         &mock_controller_event_handler_,
         base::Bind(&VideoCaptureBrowserTest::OnConnectClientToControllerAnswer,
                    base::Unretained(this), std::move(continuation)));
   }
 
   void OnConnectClientToControllerAnswer(
       base::Closure continuation,
       const base::WeakPtr<VideoCaptureController>& controller) {
     ASSERT_TRUE(controller.get());
@@ skipping 117 matching lines @@
                       gfx::Size(1280, 720), 25.0f, false},
            TestParams{"fps=15,device-count=2", 1, media::PIXEL_FORMAT_Y16,
                       gfx::Size(640, 480), 15.0f, false},
            // The 3rd device outputs MJPEG, which is converted to I420.
            TestParams{"fps=15,device-count=3", 2, media::PIXEL_FORMAT_I420,
                       gfx::Size(640, 480), 25.0f, false},
            TestParams{"fps=6,device-count=3", 2, media::PIXEL_FORMAT_I420,
                       gfx::Size(640, 480), 6.0f, true}));
 
 }  // namespace content