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

ui/compositor/test/test_compositor_host_android.cc

Index: ui/compositor/test/test_compositor_host_android.cc
diff --git a/ui/compositor/test/test_compositor_host_android.cc b/ui/compositor/test/test_compositor_host_android.cc
index 682672d6a5d3b9cc45d3ecb4a3a1803fcfc24299..aef72e8b904ba0058510267a1663f8a5be218015 100644
--- a/ui/compositor/test/test_compositor_host_android.cc
+++ b/ui/compositor/test/test_compositor_host_android.cc
@@ -16,9 +16,12 @@ namespace ui {
 
 class TestCompositorHostAndroid : public TestCompositorHost {
  public:
-  TestCompositorHostAndroid(const gfx::Rect& bounds,
-                            ui::ContextFactory* context_factory) {
+  TestCompositorHostAndroid(
+      const gfx::Rect& bounds,
+      ui::ContextFactory* context_factory,
+      ui::ContextFactoryPrivate* context_factory_private) {
     compositor_.reset(new ui::Compositor(context_factory,
+                                         context_factory_private,
                                          base::ThreadTaskRunnerHandle::Get()));
     // TODO(sievers): Support onscreen here.
     compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
@@ -38,8 +41,10 @@ class TestCompositorHostAndroid : public TestCompositorHost {
 
 TestCompositorHost* TestCompositorHost::Create(
     const gfx::Rect& bounds,
-    ui::ContextFactory* context_factory) {
-  return new TestCompositorHostAndroid(bounds, context_factory);
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private) {
+  return new TestCompositorHostAndroid(bounds, context_factory,
+                                       context_factory_private);
 }
 
 }  // namespace ui