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

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 33e5468a9c6e69a52a166e520759e0513e2a9126..27cceecf92514fc10ee382ef714af7668a9dcd51 100644
--- a/content/browser/compositor/surface_utils.cc
+++ b/content/browser/compositor/surface_utils.cc
@@ -164,7 +164,7 @@ cc::FrameSinkId AllocateFrameSinkId() {
   return ContextProviderFactoryImpl::GetInstance()->AllocateFrameSinkId();
 #else
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
-  return factory->GetContextFactory()->AllocateFrameSinkId();
+  return factory->GetContextFactoryPrivate()->AllocateFrameSinkId();
 #endif
 }
 
@@ -175,7 +175,7 @@ cc::SurfaceManager* GetSurfaceManager() {
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   if (factory == NULL)
     return nullptr;
-  return factory->GetContextFactory()->GetSurfaceManager();
+  return factory->GetContextFactoryPrivate()->GetSurfaceManager();
 #endif
 }