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

ui/compositor/test/test_compositor_host_win.cc

Index: ui/compositor/test/test_compositor_host_win.cc
diff --git a/ui/compositor/test/test_compositor_host_win.cc b/ui/compositor/test/test_compositor_host_win.cc
index 4bc3cc5c31053baa2de5e887f6d80597227a389b..aaf9d85bbcb4b8ac25babf53c2d509438215247a 100644
--- a/ui/compositor/test/test_compositor_host_win.cc
+++ b/ui/compositor/test/test_compositor_host_win.cc
@@ -18,9 +18,11 @@ class TestCompositorHostWin : public TestCompositorHost,
                               public gfx::WindowImpl {
  public:
   TestCompositorHostWin(const gfx::Rect& bounds,
-                        ui::ContextFactory* context_factory) {
+                        ui::ContextFactory* context_factory,
+                        ui::ContextFactoryPrivate* context_factory_private) {
     Init(NULL, bounds);
     compositor_.reset(new ui::Compositor(context_factory,
+                                         context_factory_private,
                                          base::ThreadTaskRunnerHandle::Get()));
     compositor_->SetAcceleratedWidget(hwnd());
     compositor_->SetScaleAndSize(1.0f, GetSize());
@@ -58,8 +60,10 @@ class TestCompositorHostWin : public TestCompositorHost,
 
 TestCompositorHost* TestCompositorHost::Create(
     const gfx::Rect& bounds,
-    ui::ContextFactory* context_factory) {
-  return new TestCompositorHostWin(bounds, context_factory);
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private) {
+  return new TestCompositorHostWin(bounds, context_factory,
+                                   context_factory_private);
 }
 
 }  // namespace ui