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

content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

 // Copyright 2014 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 "content/browser/compositor/software_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 77 matching lines @@
   cc::DelayBasedBeginFrameSource begin_frame_source_;
   std::unique_ptr<ui::Compositor> compositor_;
   int update_vsync_parameters_call_count_ = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurfaceTest);
 };
 
 void SoftwareBrowserCompositorOutputSurfaceTest::SetUp() {
   bool enable_pixel_output = false;
-  ui::ContextFactory* context_factory =
-      ui::InitializeContextFactoryForTests(enable_pixel_output);
+  ui::ContextFactory* context_factory = nullptr;
+  ui::ContextFactoryPrivate* context_factory_private = nullptr;
 
-  compositor_.reset(
-      new ui::Compositor(context_factory, message_loop_.task_runner().get()));
+  ui::InitializeContextFactoryForTests(enable_pixel_output, &context_factory,
+                                       &context_factory_private);
+
+  compositor_.reset(new ui::Compositor(context_factory, context_factory_private,
+                                       message_loop_.task_runner().get()));
   compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
 }
 
 void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() {
   output_surface_.reset();
   compositor_.reset();
   ui::TerminateContextFactoryForTests();
 }
 
 std::unique_ptr<content::BrowserCompositorOutputSurface>
@@ skipping 33 matching lines @@
   output_surface_->BindToClient(&output_surface_client);
 
   FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>(
       output_surface_->software_device()->GetVSyncProvider());
   EXPECT_EQ(0, vsync_provider->call_count());
 
   output_surface_->SwapBuffers(cc::OutputSurfaceFrame());
   EXPECT_EQ(1, vsync_provider->call_count());
   EXPECT_EQ(1, update_vsync_parameters_call_count_);
 }