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

ui/compositor/test/test_compositor_host_mac.mm

Index: ui/compositor/test/test_compositor_host_mac.mm
diff --git a/ui/compositor/test/test_compositor_host_mac.mm b/ui/compositor/test/test_compositor_host_mac.mm
index c114e5d21ca701ff8c6c062daab6ebd567e45443..e907b3b1790a6b2ff172a3858703743da578e85a 100644
--- a/ui/compositor/test/test_compositor_host_mac.mm
+++ b/ui/compositor/test/test_compositor_host_mac.mm
@@ -84,7 +84,8 @@ class TestCompositorHostMac : public TestCompositorHost,
                               public AppKitHost {
  public:
   TestCompositorHostMac(const gfx::Rect& bounds,
-                        ui::ContextFactory* context_factory);
+                        ui::ContextFactory* context_factory,
+                        ui::ContextFactoryPrivate* context_factory_private);
   ~TestCompositorHostMac() override;
 
  private:
@@ -104,11 +105,13 @@ class TestCompositorHostMac : public TestCompositorHost,
 
 TestCompositorHostMac::TestCompositorHostMac(
     const gfx::Rect& bounds,
-    ui::ContextFactory* context_factory)
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private)
     : bounds_(bounds),
-      compositor_(context_factory, base::ThreadTaskRunnerHandle::Get()),
-      window_(nil) {
-}
+      compositor_(context_factory,
+                  context_factory_private,
+                  base::ThreadTaskRunnerHandle::Get()),
+      window_(nil) {}
 
 TestCompositorHostMac::~TestCompositorHostMac() {
   // Release reference to |compositor_|.  Important because the |compositor_|
@@ -150,8 +153,10 @@ ui::Compositor* TestCompositorHostMac::GetCompositor() {
 // static
 TestCompositorHost* TestCompositorHost::Create(
     const gfx::Rect& bounds,
-    ui::ContextFactory* context_factory) {
-  return new TestCompositorHostMac(bounds, context_factory);
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private) {
+  return new TestCompositorHostMac(bounds, context_factory,
+                                   context_factory_private);
 }
 
 }  // namespace ui