VideoCapture: migrate VideoCapture renderer-->host messages to mojo, part 1

content/browser/renderer_host/media/video_capture_host.h

 // 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.
 //
 // VideoCaptureHost serves video capture related messages from
 // VideoCaptureMessageFilter which lives inside the render process.
 //
 // This class is owned by RenderProcessHostImpl, and instantiated on UI
 // thread, but all other operations and method calls happen on IO thread.
 //
@@ skipping 24 matching lines @@
 //      | < VideoCaptureMsg_FreeBuffer(1)        |  Buffers are re-allocated
 //      | < VideoCaptureMsg_NewBuffer(4)         |  with a larger size, as
 //      | < VideoCaptureMsg_BufferReady(4)       |  needed.
 //      | VideoCaptureHostMsg_BufferReady(2) >   |
 //      | < VideoCaptureMsg_FreeBuffer(2)        |
 //      | < VideoCaptureMsg_NewBuffer(5)         |
 //      | < VideoCaptureMsg_BufferReady(5)       |
 //      |             ...                        |
 //      |                                        |
 //      | < VideoCaptureMsg_BufferReady          |
-//      | VideoCaptureHostMsg_Stop >             |
+//      |  --------- StopCapture --------->      |
 //      | VideoCaptureHostMsg_BufferReady >      |
 //      | < VideoCaptureMsg_StateChanged         |
 //      |         (VIDEO_CAPTURE_STATE_STOPPED)  |
 //      v                                        v
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.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/common/content_export.h"
+#include "content/common/video_capture.mojom.h"
+#include "content/public/browser/browser_associated_interface.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "ipc/ipc_message.h"
 
 namespace content {
 class MediaStreamManager;
 
 class CONTENT_EXPORT VideoCaptureHost
     : public BrowserMessageFilter,
-      public VideoCaptureControllerEventHandler {
+      public VideoCaptureControllerEventHandler,
+      public BrowserAssociatedInterface<mojom::VideoCaptureRendererToBrowser>,
+      public mojom::VideoCaptureRendererToBrowser {
  public:
   explicit VideoCaptureHost(MediaStreamManager* media_stream_manager);
 
   // BrowserMessageFilter implementation.
   void OnChannelClosing() override;
   void OnDestruct() const override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // VideoCaptureControllerEventHandler implementation.
   void OnError(VideoCaptureControllerID id) override;
@@ skipping 16 matching lines @@
   friend class BrowserThread;
   friend class base::DeleteHelper<VideoCaptureHost>;
   friend class MockVideoCaptureHost;
   friend class VideoCaptureHostTest;
 
   void DoError(VideoCaptureControllerID id);
   void DoEnded(VideoCaptureControllerID id);
 
   ~VideoCaptureHost() override;
 
-  // IPC message: Start capture on the VideoCaptureDevice referenced by
-  // |device_id|. |session_id| is an id created by VideoCaptureMessageFilter
-  // to identify a session between a VideoCaptureMessageFilter and a
-  // VideoCaptureHost.
+  // IPC message handlers.
   void OnStartCapture(int device_id,
                       media::VideoCaptureSessionId session_id,
                       const media::VideoCaptureParams& params);
+  void OnResumeCapture(int device_id,
+                       media::VideoCaptureSessionId session_id,
+                       const media::VideoCaptureParams& params);
+  void OnRendererFinishedWithBuffer(int device_id,
+                                    int buffer_id,
+                                    const gpu::SyncToken& sync_token,
+                                    double consumer_resource_utilization);
+  void OnGetDeviceSupportedFormats(
+      int device_id,
+      media::VideoCaptureSessionId capture_session_id);

[chfremer, 2016/10/03 19:58:42]

nit: Since we are already touching this code, we could increase consistency by
deciding to name this parameter either "capture_session_id" or "session_id"
consistently across these methods.

[mcasas, 2016/10/03 20:15:42]

Absolutely! Im doing it in the next CL :)

+  void OnGetDeviceFormatsInUse(int device_id,
+                               media::VideoCaptureSessionId capture_session_id);
+
+  // mojom::VideoCaptureRendererToBrowser implementation
+  void StopCapture(int32_t device_id) override;
+  void PauseCapture(int32_t device_id) override;
+  void RequestRefreshFrame(int32_t device_id) override;
+
   void OnControllerAdded(
       int device_id,
       const base::WeakPtr<VideoCaptureController>& controller);
 
-  // IPC message: Stop capture on device referenced by |device_id|.
-  void OnStopCapture(int device_id);
-
-  // IPC message: Pause capture on device referenced by |device_id|.
-  void OnPauseCapture(int device_id);
-
-  void OnResumeCapture(int device_id,
-                       media::VideoCaptureSessionId session_id,
-                       const media::VideoCaptureParams& params);
-
-  // IPC message: Requests that the video capture send a frame "soon" (e.g., to
-  // resolve picture loss or quality issues).
-  void OnRequestRefreshFrame(int device_id);
-
-  // IPC message: Called when a renderer is finished using a buffer. Notifies
-  // the controller.
-  void OnRendererFinishedWithBuffer(int device_id,
-                                    int buffer_id,
-                                    const gpu::SyncToken& sync_token,
-                                    double consumer_resource_utilization);
-
-  // IPC message: Get supported formats referenced by |capture_session_id|.
-  // |device_id| is needed for message back-routing purposes.
-  void OnGetDeviceSupportedFormats(
-      int device_id,
-      media::VideoCaptureSessionId capture_session_id);
-
-  // IPC message: Get a device's currently in use format(s), referenced by
-  // |capture_session_id|. |device_id| is needed for message back-routing
-  // purposes.
-  void OnGetDeviceFormatsInUse(int device_id,
-                               media::VideoCaptureSessionId capture_session_id);
-
   // Deletes the controller and notifies the VideoCaptureManager. |on_error| is
   // true if this is triggered by VideoCaptureControllerEventHandler::OnError.
   void DeleteVideoCaptureController(VideoCaptureControllerID controller_id,
                                     bool on_error);
 
   MediaStreamManager* const media_stream_manager_;
 
-  typedef std::map<VideoCaptureControllerID,
-                   base::WeakPtr<VideoCaptureController>> EntryMap;
-
   // A map of VideoCaptureControllerID to the VideoCaptureController to which it
   // is connected. An entry in this map holds a null controller while it is in
   // the process of starting.
-  EntryMap entries_;
+  std::map<VideoCaptureControllerID, base::WeakPtr<VideoCaptureController>>
+      controllers_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_