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

content/browser/renderer_host/browser_compositor_view_mac.mm

Index: content/browser/renderer_host/browser_compositor_view_mac.mm
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
index 93944dc85ad8f932bca73699111991cfd9af903f..84087ff3bb610dea1ac4126d563628e250fdc6e7 100644
--- a/content/browser/renderer_host/browser_compositor_view_mac.mm
+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
@@ -99,6 +99,7 @@ class RecyclableCompositorMac : public ui::CompositorObserver {
 RecyclableCompositorMac::RecyclableCompositorMac()
     : accelerated_widget_mac_(new ui::AcceleratedWidgetMac()),
       compositor_(content::GetContextFactory(),
+                  content::GetContextFactoryPrivate(),
                   ui::WindowResizeHelperMac::Get()->task_runner()) {
   compositor_.SetAcceleratedWidget(
       accelerated_widget_mac_->accelerated_widget());
@@ -175,7 +176,7 @@ BrowserCompositorMac::BrowserCompositorMac(
   root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   delegated_frame_host_.reset(new DelegatedFrameHost(
-      factory->GetContextFactory()->AllocateFrameSinkId(), this));
+      factory->GetContextFactoryPrivate()->AllocateFrameSinkId(), this));
 
   SetRenderWidgetHostIsHidden(render_widget_host_is_hidden);
   SetNSViewAttachedToWindow(ns_view_attached_to_window);