BrowserMainLoop owns FrameSinkManagerHost

content/browser/compositor/surface_utils.cc

Index: content/browser/compositor/surface_utils.cc
diff --git a/content/browser/compositor/surface_utils.cc b/content/browser/compositor/surface_utils.cc
index 4fb995a555ff3182ed6a4a7115567051310d5ccc..7ed188d154d65a39cfc7c7383c4c9be003cbe903 100644
--- a/content/browser/compositor/surface_utils.cc
+++ b/content/browser/compositor/surface_utils.cc
@@ -12,6 +12,7 @@
 #include "cc/resources/single_release_callback.h"
 #include "components/viz/display_compositor/gl_helper.h"
 #include "components/viz/host/frame_sink_manager_host.h"
+#include "content/browser/browser_main_loop.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
@@ -174,14 +175,7 @@ cc::SurfaceManager* GetSurfaceManager() {
 }
 
 viz::FrameSinkManagerHost* GetFrameSinkManagerHost() {
-#if defined(OS_ANDROID)
-  return CompositorImpl::GetFrameSinkManagerHost();

[piman, 2017/06/09 21:09:28]

Should we remove the FrameSinkManagerHost in CompositorImpl then? Otherwise I
think we'll end up with 2 of them.

[Fady Samuel, 2017/06/09 21:49:17]

Done.

-#else
-  ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
-  if (!factory)
-    return nullptr;
-  return factory->GetContextFactoryPrivate()->GetFrameSinkManagerHost();
-#endif
+  return BrowserMainLoop::GetInstance()->frame_sink_manager_host();
 }
 
 void CopyFromCompositingSurfaceHasResult(