BrowserMainLoop owns FrameSinkManagerHost

content/browser/compositor/gpu_process_transport_factory.cc

Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 417dc0f57acf66c79a8a3e98e932e11d543fa7fa..c2448d1e4069bc35b5867f544f2ede3a85b4d648 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -34,6 +34,7 @@
 #include "components/viz/display_compositor/gl_helper.h"
 #include "components/viz/display_compositor/host_shared_bitmap_manager.h"
 #include "components/viz/host/frame_sink_manager_host.h"
+#include "content/browser/browser_main_loop.h"
 #include "content/browser/compositor/browser_compositor_output_surface.h"
 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
 #include "content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h"
@@ -206,9 +207,6 @@ GpuProcessTransportFactory::GpuProcessTransportFactory()
       callback_factory_(this) {
   cc::SetClientNameForMetrics("Browser");
 
-  frame_sink_manager_host_ = base::MakeUnique<viz::FrameSinkManagerHost>();
-  frame_sink_manager_host_->ConnectToFrameSinkManager();
-
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableGpuVsync)) {
     std::string display_vsync_string =
@@ -714,12 +712,14 @@ cc::FrameSinkId GpuProcessTransportFactory::AllocateFrameSinkId() {
 }
 
 cc::SurfaceManager* GpuProcessTransportFactory::GetSurfaceManager() {
-  return frame_sink_manager_host_->surface_manager();
+  return BrowserMainLoop::GetInstance()
+      ->frame_sink_manager_host()
+      ->surface_manager();
 }
 
 viz::FrameSinkManagerHost*
 GpuProcessTransportFactory::GetFrameSinkManagerHost() {
-  return frame_sink_manager_host_.get();
+  return BrowserMainLoop::GetInstance()->frame_sink_manager_host();
 }
 
 void GpuProcessTransportFactory::SetDisplayVisible(ui::Compositor* compositor,