media: Add MediaInterfaceProxy

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index f3d73282c0f3f419038b372b518aa810bf6d572a..52d2b1f9cca7a15dbfc7767d78708a9ea768550b 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -79,6 +79,7 @@ class AssociatedInterfaceProviderImpl;
 class CrossProcessFrameConnector;
 class FrameTree;
 class FrameTreeNode;
+class MediaInterfaceProxy;
 class NavigationHandleImpl;
 class PermissionServiceContext;
 class RenderFrameHostDelegate;
@@ -196,10 +197,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
   // SiteInstanceImpl::Observer
   void RenderProcessGone(SiteInstanceImpl* site_instance) override;
 
-  // service_manager::InterfaceFactory<media::mojom::InterfaceFactory>
-  void Create(const service_manager::Identity& remote_identity,
-              media::mojom::InterfaceFactoryRequest request) override;
-
   // Creates a RenderFrame in the renderer process.
   bool CreateRenderFrame(int proxy_routing_id,
                          int opener_routing_id,
@@ -805,6 +802,13 @@ class CONTENT_EXPORT RenderFrameHostImpl
   // Deletes the Web Bluetooth Service owned by the frame.
   void DeleteWebBluetoothService();
 
+  // service_manager::InterfaceFactory<media::mojom::InterfaceFactory>
+  void Create(const service_manager::Identity& remote_identity,
+              media::mojom::InterfaceFactoryRequest request) override;
+
+  // Callback for connection error on the media::mojom::InterfaceFactory client.
+  void OnMediaInterfaceFactoryConnectionError();
+
   // Allows tests to disable the swapout event timer to simulate bugs that
   // happen before it fires (to avoid flakiness).
   void DisableSwapOutTimerForTesting();
@@ -812,6 +816,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
   void OnRendererConnect(const service_manager::ServiceInfo& local_info,
                          const service_manager::ServiceInfo& remote_info);
 
+

[nasko, 2016/12/02 22:18:09]

nit: Unneeded empty line.

[xhwang, 2016/12/02 23:42:21]

Done.

   // Returns ownership of the NavigationHandle associated with a navigation that
   // just committed.
   std::unique_ptr<NavigationHandleImpl> TakeNavigationHandleForCommit(
@@ -1065,6 +1070,10 @@ class CONTENT_EXPORT RenderFrameHostImpl
   // |FrameHostMsg_TextSurroundingSelectionResponse| message comes.
   TextSurroundingSelectionCallback text_surrounding_selection_callback_;
 
+  // Hosts media::mojom::InterfaceFactory for the render frame and forwards

[nasko, 2016/12/02 22:18:09]

nit: RenderFrame

[xhwang, 2016/12/02 23:42:21]

Done.

+  // media::mojom::InterfaceFactory calls to the remote service:media.
+  std::unique_ptr<MediaInterfaceProxy> media_interface_proxy_;
+
   std::vector<std::unique_ptr<service_manager::InterfaceRegistry>>
       media_registries_;