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

ui/compositor/test/test_compositor_host_x11.cc

Index: ui/compositor/test/test_compositor_host_x11.cc
diff --git a/ui/compositor/test/test_compositor_host_x11.cc b/ui/compositor/test/test_compositor_host_x11.cc
index 82fc7ad1239bbd325ef544c36535817bca6851d1..ddf41944b0e3a65f8ceb9ac8578af0e974cc9c25 100644
--- a/ui/compositor/test/test_compositor_host_x11.cc
+++ b/ui/compositor/test/test_compositor_host_x11.cc
@@ -24,7 +24,8 @@ namespace ui {
 class TestCompositorHostX11 : public TestCompositorHost {
  public:
   TestCompositorHostX11(const gfx::Rect& bounds,
-                        ui::ContextFactory* context_factory);
+                        ui::ContextFactory* context_factory,
+                        ui::ContextFactoryPrivate* context_factory_private);
   ~TestCompositorHostX11() override;
 
  private:
@@ -35,6 +36,7 @@ class TestCompositorHostX11 : public TestCompositorHost {
   gfx::Rect bounds_;
 
   ui::ContextFactory* context_factory_;
+  ui::ContextFactoryPrivate* context_factory_private_;
 
   ui::Compositor compositor_;
 
@@ -47,10 +49,14 @@ class TestCompositorHostX11 : public TestCompositorHost {
 
 TestCompositorHostX11::TestCompositorHostX11(
     const gfx::Rect& bounds,
-    ui::ContextFactory* context_factory)
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private)
     : bounds_(bounds),
       context_factory_(context_factory),
-      compositor_(context_factory_, base::ThreadTaskRunnerHandle::Get()) {}
+      context_factory_private_(context_factory_private),
+      compositor_(context_factory_,
+                  context_factory_private_,
+                  base::ThreadTaskRunnerHandle::Get()) {}
 
 TestCompositorHostX11::~TestCompositorHostX11() {}
 
@@ -89,8 +95,10 @@ ui::Compositor* TestCompositorHostX11::GetCompositor() {
 // static
 TestCompositorHost* TestCompositorHost::Create(
     const gfx::Rect& bounds,
-    ui::ContextFactory* context_factory) {
-  return new TestCompositorHostX11(bounds, context_factory);
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private) {
+  return new TestCompositorHostX11(bounds, context_factory,
+                                   context_factory_private);
 }
 
 }  // namespace ui