[Mojo Video Capture] Split interface BuildableVideoCaptureDevice

content/browser/renderer_host/media/video_capture_manager.cc

Index: content/browser/renderer_host/media/video_capture_manager.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index 67965da76cc728bf02471335eb5b6c95b25064f2..862f820cca7dd8f601e8621bbf8797ccb5ef933c 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -26,7 +26,6 @@
 #include "content/browser/media/capture/web_contents_video_capture_device.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
-#include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_media_id.h"
 #include "content/public/common/media_stream_request.h"
@@ -287,7 +286,7 @@ void VideoCaptureManager::ProcessDeviceStartRequestQueue() {
     const media::VideoCaptureDeviceInfo* device_info =
         GetDeviceInfoById(controller->device_id());
     if (!device_info) {
-      OnDeviceStartFailed(controller);
+      OnDeviceLaunchFailed(controller);
       return;
     }
     for (auto& observer : capture_observers_)
@@ -302,15 +301,14 @@ void VideoCaptureManager::ProcessDeviceStartRequestQueue() {
   // TODO(chfremer): Check if request->params() can actually be different from
   // controller->parameters, and simplify if this is not the case.
   controller->CreateAndStartDeviceAsync(
-      request->params(),
-      static_cast<BuildableVideoCaptureDevice::Callbacks*>(this),
+      request->params(), static_cast<VideoCaptureDeviceLaunchObserver*>(this),
       base::Bind([](scoped_refptr<VideoCaptureManager>,
                     scoped_refptr<VideoCaptureController>) {},
                  scoped_refptr<VideoCaptureManager>(this),
                  GetControllerSharedRef(controller)));
 }
 
-void VideoCaptureManager::OnDeviceStarted(VideoCaptureController* controller) {
+void VideoCaptureManager::OnDeviceLaunched(VideoCaptureController* controller) {
   DVLOG(3) << __func__;
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!device_start_request_queue_.empty());
@@ -339,7 +337,7 @@ void VideoCaptureManager::OnDeviceStarted(VideoCaptureController* controller) {
   ProcessDeviceStartRequestQueue();
 }
 
-void VideoCaptureManager::OnDeviceStartFailed(
+void VideoCaptureManager::OnDeviceLaunchFailed(
     VideoCaptureController* controller) {
   const std::string log_message = base::StringPrintf(
       "Starting device %s has failed. Maybe recently disconnected?",
@@ -352,7 +350,7 @@ void VideoCaptureManager::OnDeviceStartFailed(
   ProcessDeviceStartRequestQueue();
 }
 
-void VideoCaptureManager::OnDeviceStartAborted() {
+void VideoCaptureManager::OnDeviceLaunchAborted() {
   device_start_request_queue_.pop_front();
   ProcessDeviceStartRequestQueue();
 }
@@ -787,10 +785,9 @@ VideoCaptureController* VideoCaptureManager::GetOrCreateController(
     return existing_device;
   }
 
-  VideoCaptureController* new_controller =
-      new VideoCaptureController(device_info.id, device_info.type, params,
-                                 video_capture_provider_->CreateBuildableDevice(
-                                     device_info.id, device_info.type));
+  VideoCaptureController* new_controller = new VideoCaptureController(
+      device_info.id, device_info.type, params,
+      video_capture_provider_->CreateDeviceLauncher());
   controllers_.emplace_back(new_controller);
   return new_controller;
 }