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

ui/compositor/test/test_compositor_host.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_COMPOSITOR_TEST_TEST_COMPOSITOR_HOST_H_
 #define UI_COMPOSITOR_TEST_TEST_COMPOSITOR_HOST_H_
 
 namespace gfx {
 class Rect;
 }
 
 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;
 
   virtual Compositor* GetCompositor() = 0;
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_TEST_TEST_COMPOSITOR_HOST_H_