ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate

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 0ba9c7bd0fa57e2bd642aa7ba38994637dbb24c6..31fc6063c53718306bfdfb7319596c090e5fea82 100644
--- a/content/browser/renderer_host/delegated_frame_host.cc
+++ b/content/browser/renderer_host/delegated_frame_host.cc
@@ -79,13 +79,14 @@ DelegatedFrameHost::DelegatedFrameHost(const cc::FrameSinkId& frame_sink_id,
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   factory->GetContextFactory()->AddObserver(this);
   id_allocator_.reset(new cc::SurfaceIdAllocator());
-  factory->GetContextFactory()->GetSurfaceManager()->RegisterFrameSinkId(
+  factory->GetContextFactoryPrivate()->GetSurfaceManager()->RegisterFrameSinkId(
       frame_sink_id_);
-  factory->GetContextFactory()
+  factory->GetContextFactoryPrivate()
       ->GetSurfaceManager()
       ->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   surface_factory_ = base::MakeUnique<cc::SurfaceFactory>(
-      frame_sink_id_, factory->GetContextFactory()->GetSurfaceManager(), this);
+      frame_sink_id_, factory->GetContextFactoryPrivate()->GetSurfaceManager(),
+      this);
 }
 
 void DelegatedFrameHost::WasShown(const ui::LatencyInfo& latency_info) {
@@ -478,7 +479,7 @@ void DelegatedFrameHost::SwapDelegatedFrame(uint32_t compositor_frame_sink_id,
   } else {
     ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
     cc::SurfaceManager* manager =
-        factory->GetContextFactory()->GetSurfaceManager();
+        factory->GetContextFactoryPrivate()->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_) {
@@ -833,11 +834,12 @@ DelegatedFrameHost::~DelegatedFrameHost() {
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   factory->GetContextFactory()->RemoveObserver(this);
   surface_factory_->EvictSurface();
-  factory->GetContextFactory()
+  factory->GetContextFactoryPrivate()
       ->GetSurfaceManager()
       ->UnregisterSurfaceFactoryClient(frame_sink_id_);
-  factory->GetContextFactory()->GetSurfaceManager()->InvalidateFrameSinkId(
-      frame_sink_id_);
+  factory->GetContextFactoryPrivate()
+      ->GetSurfaceManager()
+      ->InvalidateFrameSinkId(frame_sink_id_);
 
   DCHECK(!vsync_manager_.get());
 }