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

ui/compositor/test/test_compositor_host_win.cc

 // Copyright (c) 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.
 
 #include "ui/compositor/test/test_compositor_host.h"
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/win/window_impl.h"
 
 namespace ui {
 
 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());
   }
 
   ~TestCompositorHostWin() override { DestroyWindow(hwnd()); }
 
   // Overridden from TestCompositorHost:
   void Show() override {
     ShowWindow(hwnd(), SW_SHOWNORMAL);
@@ skipping 17 matching lines @@
     return gfx::Rect(r).size();
   }
 
   std::unique_ptr<ui::Compositor> compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCompositorHostWin);
 };
 
 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