Add FrameSinkManagerHost to NoTransportImageTransportFactory.

content/browser/compositor/frame_sink_manager_host.cc

Index: content/browser/compositor/frame_sink_manager_host.cc
diff --git a/content/browser/compositor/frame_sink_manager_host.cc b/content/browser/compositor/frame_sink_manager_host.cc
index 089abdb261b76fd90b8d288092330150d88ff8ff..ea57d329fc4e603a733d71481d2bbb59bb0ae443 100644
--- a/content/browser/compositor/frame_sink_manager_host.cc
+++ b/content/browser/compositor/frame_sink_manager_host.cc
@@ -14,9 +14,7 @@ namespace content {
 FrameSinkManagerHost::FrameSinkManagerHost()
     : binding_(this),
       frame_sink_manager_(false,  // Use surface sequences.
-                          nullptr,
-                          MakeRequest(&frame_sink_manager_ptr_),
-                          binding_.CreateInterfacePtrAndBind()) {}
+                          nullptr) {}
 
 FrameSinkManagerHost::~FrameSinkManagerHost() {}
 
@@ -24,11 +22,18 @@ cc::SurfaceManager* FrameSinkManagerHost::surface_manager() {
   return frame_sink_manager_.surface_manager();
 }
 
+void FrameSinkManagerHost::ConnectToFrameSinkManager() {
+  DCHECK(!frame_sink_manager_ptr_.is_bound());
+  frame_sink_manager_.Connect(mojo::MakeRequest(&frame_sink_manager_ptr_),
+                              binding_.CreateInterfacePtrAndBind());
+}
+
 void FrameSinkManagerHost::CreateCompositorFrameSink(
     const cc::FrameSinkId& frame_sink_id,
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
+  DCHECK(frame_sink_manager_ptr_.is_bound());
   frame_sink_manager_ptr_->CreateCompositorFrameSink(
       frame_sink_id, std::move(request), std::move(private_request),
       std::move(client));
@@ -37,6 +42,7 @@ void FrameSinkManagerHost::CreateCompositorFrameSink(
 void FrameSinkManagerHost::RegisterFrameSinkHierarchy(
     const cc::FrameSinkId& parent_frame_sink_id,
     const cc::FrameSinkId& child_frame_sink_id) {
+  DCHECK(frame_sink_manager_ptr_.is_bound());
   frame_sink_manager_ptr_->RegisterFrameSinkHierarchy(parent_frame_sink_id,
                                                       child_frame_sink_id);
 }
@@ -44,6 +50,7 @@ void FrameSinkManagerHost::RegisterFrameSinkHierarchy(
 void FrameSinkManagerHost::UnregisterFrameSinkHierarchy(
     const cc::FrameSinkId& parent_frame_sink_id,
     const cc::FrameSinkId& child_frame_sink_id) {
+  DCHECK(frame_sink_manager_ptr_.is_bound());
   frame_sink_manager_ptr_->UnregisterFrameSinkHierarchy(parent_frame_sink_id,
                                                         child_frame_sink_id);
 }