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

ui/compositor/test/test_compositor_host_mac.mm

 // 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"
 
 #import <AppKit/NSApplication.h>
 #import <AppKit/NSOpenGL.h>
 #import <AppKit/NSView.h>
 #import <AppKit/NSWindow.h>
@@ skipping 66 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(AppKitHost);
 };
 
 // TestCompositorHostMac provides a window surface and a coordinated compositor
 // for use in the compositor unit tests.
 class TestCompositorHostMac : public TestCompositorHost,
                               public AppKitHost {
  public:
   TestCompositorHostMac(const gfx::Rect& bounds,
-                        ui::ContextFactory* context_factory);
+                        ui::ContextFactory* context_factory,
+                        ui::ContextFactoryPrivate* context_factory_private);
   ~TestCompositorHostMac() override;
 
  private:
   // TestCompositorHost:
   void Show() override;
   ui::Compositor* GetCompositor() override;
 
   gfx::Rect bounds_;
 
   ui::Compositor compositor_;
 
   // Owned.  Released when window is closed.
   NSWindow* window_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCompositorHostMac);
 };
 
 TestCompositorHostMac::TestCompositorHostMac(
     const gfx::Rect& bounds,
-    ui::ContextFactory* context_factory)
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private)
     : bounds_(bounds),
-      compositor_(context_factory, base::ThreadTaskRunnerHandle::Get()),
-      window_(nil) {
-}
+      compositor_(context_factory,
+                  context_factory_private,
+                  base::ThreadTaskRunnerHandle::Get()),
+      window_(nil) {}
 
 TestCompositorHostMac::~TestCompositorHostMac() {
   // Release reference to |compositor_|.  Important because the |compositor_|
   // holds |this| as its delegate, so that reference must be removed here.
   [[window_ contentView] setCompositor:NULL];
   {
     base::scoped_nsobject<NSView> new_view(
         [[NSView alloc] initWithFrame:NSZeroRect]);
     [window_ setContentView:new_view.get()];
   }
@@ skipping 21 matching lines @@
   [window_ orderFront:nil];
 }
 
 ui::Compositor* TestCompositorHostMac::GetCompositor() {
   return &compositor_;
 }
 
 // static
 TestCompositorHost* TestCompositorHost::Create(
     const gfx::Rect& bounds,
-    ui::ContextFactory* context_factory) {
-  return new TestCompositorHostMac(bounds, context_factory);
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private) {
+  return new TestCompositorHostMac(bounds, context_factory,
+                                   context_factory_private);
 }
 
 }  // namespace ui