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

ui/compositor/test/test_compositor_host_ozone.cc

Index: ui/compositor/test/test_compositor_host_ozone.cc
diff --git a/ui/compositor/test/test_compositor_host_ozone.cc b/ui/compositor/test/test_compositor_host_ozone.cc
index 281c6fdbb5bb47a801c187b6cbca600a4a7b02bc..2acaa7b4cc105aedfd9b67ad5c729290dea8e055 100644
--- a/ui/compositor/test/test_compositor_host_ozone.cc
+++ b/ui/compositor/test/test_compositor_host_ozone.cc
@@ -20,7 +20,8 @@ namespace ui {
 class TestCompositorHostOzone : public TestCompositorHost {
  public:
   TestCompositorHostOzone(const gfx::Rect& bounds,
-                          ui::ContextFactory* context_factory);
+                          ui::ContextFactory* context_factory,
+                          ui::ContextFactoryPrivate* context_factory_private);
   ~TestCompositorHostOzone() override;
 
  private:
@@ -37,9 +38,12 @@ class TestCompositorHostOzone : public TestCompositorHost {
 
 TestCompositorHostOzone::TestCompositorHostOzone(
     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()) {}
+      compositor_(context_factory,
+                  context_factory_private,
+                  base::ThreadTaskRunnerHandle::Get()) {}
 
 TestCompositorHostOzone::~TestCompositorHostOzone() {}
 
@@ -63,8 +67,10 @@ ui::Compositor* TestCompositorHostOzone::GetCompositor() {
 // static
 TestCompositorHost* TestCompositorHost::Create(
     const gfx::Rect& bounds,
-    ui::ContextFactory* context_factory) {
-  return new TestCompositorHostOzone(bounds, context_factory);
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private) {
+  return new TestCompositorHostOzone(bounds, context_factory,
+                                     context_factory_private);
 }
 
 }  // namespace ui