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

ui/compositor/test/test_compositor_host.h

Index: ui/compositor/test/test_compositor_host.h
diff --git a/ui/compositor/test/test_compositor_host.h b/ui/compositor/test/test_compositor_host.h
index 2fc1f16e193cb96cb33026abb96fb332e0fdbee1..a84925bb94aa2cc9f0db7a44ee1c018f5222f7e4 100644
--- a/ui/compositor/test/test_compositor_host.h
+++ b/ui/compositor/test/test_compositor_host.h
@@ -13,14 +13,17 @@ namespace ui {
 
 class Compositor;
 class ContextFactory;
+class ContextFactoryPrivate;
 
 class TestCompositorHost {
  public:
   virtual ~TestCompositorHost() {}
 
   // Creates a new TestCompositorHost. The caller owns the returned value.
-  static TestCompositorHost* Create(const gfx::Rect& bounds,
-                                    ui::ContextFactory* context_factory);
+  static TestCompositorHost* Create(
+      const gfx::Rect& bounds,
+      ui::ContextFactory* context_factory,
+      ui::ContextFactoryPrivate* context_factory_private);
 
   // Shows the TestCompositorHost. Must only be called once.
   virtual void Show() = 0;