Get rid of ImageTransportFactory::GetSurfaceManager

content/browser/renderer_host/delegated_frame_host.cc

Index: content/browser/renderer_host/delegated_frame_host.cc
diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc
index 840d3a4b6cd0de7497cb37b6e50f9534dbf89efa..0ba9c7bd0fa57e2bd642aa7ba38994637dbb24c6 100644
--- a/content/browser/renderer_host/delegated_frame_host.cc
+++ b/content/browser/renderer_host/delegated_frame_host.cc
@@ -79,11 +79,13 @@ DelegatedFrameHost::DelegatedFrameHost(const cc::FrameSinkId& frame_sink_id,
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   factory->GetContextFactory()->AddObserver(this);
   id_allocator_.reset(new cc::SurfaceIdAllocator());
-  factory->GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
-  factory->GetSurfaceManager()->RegisterSurfaceFactoryClient(frame_sink_id_,
-                                                             this);
+  factory->GetContextFactory()->GetSurfaceManager()->RegisterFrameSinkId(
+      frame_sink_id_);
+  factory->GetContextFactory()
+      ->GetSurfaceManager()
+      ->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   surface_factory_ = base::MakeUnique<cc::SurfaceFactory>(
-      frame_sink_id_, factory->GetSurfaceManager(), this);
+      frame_sink_id_, factory->GetContextFactory()->GetSurfaceManager(), this);
 }
 
 void DelegatedFrameHost::WasShown(const ui::LatencyInfo& latency_info) {
@@ -475,7 +477,8 @@ void DelegatedFrameHost::SwapDelegatedFrame(uint32_t compositor_frame_sink_id,
     EvictDelegatedFrame();
   } else {
     ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
-    cc::SurfaceManager* manager = factory->GetSurfaceManager();
+    cc::SurfaceManager* manager =
+        factory->GetContextFactory()->GetSurfaceManager();
     bool allocated_new_local_frame_id = false;
     if (!local_frame_id_.is_valid() || frame_size != current_surface_size_ ||
         frame_size_in_dip != current_frame_size_in_dip_) {
@@ -830,8 +833,11 @@ DelegatedFrameHost::~DelegatedFrameHost() {
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   factory->GetContextFactory()->RemoveObserver(this);
   surface_factory_->EvictSurface();
-  factory->GetSurfaceManager()->UnregisterSurfaceFactoryClient(frame_sink_id_);
-  factory->GetSurfaceManager()->InvalidateFrameSinkId(frame_sink_id_);
+  factory->GetContextFactory()
+      ->GetSurfaceManager()
+      ->UnregisterSurfaceFactoryClient(frame_sink_id_);
+  factory->GetContextFactory()->GetSurfaceManager()->InvalidateFrameSinkId(
+      frame_sink_id_);
 
   DCHECK(!vsync_manager_.get());
 }