BrowserMainLoop owns FrameSinkManagerHost

content/browser/renderer_host/compositor_impl_android.cc

Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 0fe80c4e0a623f0ca0bbdb89a4225dc7b43db32a..c3c55ea23d6ec38bffcec32ce35a8e78fa2f1f66 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -50,6 +50,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/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/browser/gpu/compositor_util.h"
@@ -97,11 +98,9 @@ class SingleThreadTaskGraphRunner : public cc::SingleThreadTaskGraphRunner {
 
 struct CompositorDependencies {
   CompositorDependencies() : frame_sink_id_allocator(kDefaultClientId) {
-    frame_sink_manager_host.ConnectToFrameSinkManager();
   }
 
   SingleThreadTaskGraphRunner task_graph_runner;
-  viz::FrameSinkManagerHost frame_sink_manager_host;
   cc::FrameSinkIdAllocator frame_sink_id_allocator;
 
 #if BUILDFLAG(ENABLE_VULKAN)
@@ -402,13 +401,9 @@ void Compositor::CreateContextProvider(
 
 // static
 cc::SurfaceManager* CompositorImpl::GetSurfaceManager() {
-  return g_compositor_dependencies.Get()
-      .frame_sink_manager_host.surface_manager();
-}
-
-// static
-viz::FrameSinkManagerHost* CompositorImpl::GetFrameSinkManagerHost() {
-  return &g_compositor_dependencies.Get().frame_sink_manager_host;
+  return BrowserMainLoop::GetInstance()
+      ->frame_sink_manager_host()
+      ->surface_manager();
 }
 
 // static