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

ui/compositor/compositor_unittest.cc

Index: ui/compositor/compositor_unittest.cc
diff --git a/ui/compositor/compositor_unittest.cc b/ui/compositor/compositor_unittest.cc
index 753983e8f62012dc9cf60629d2cd518bef16b889..ee5be85fd59436efe9bf81d930dc1d7c34db4281 100644
--- a/ui/compositor/compositor_unittest.cc
+++ b/ui/compositor/compositor_unittest.cc
@@ -70,10 +70,13 @@ class CompositorTest : public testing::Test {
   void SetUp() override {
     task_runner_ = base::ThreadTaskRunnerHandle::Get();
 
-    ui::ContextFactory* context_factory =
-        ui::InitializeContextFactoryForTests(false);
+    ui::ContextFactory* context_factory = nullptr;
+    ui::ContextFactoryPrivate* context_factory_private = nullptr;
+    ui::InitializeContextFactoryForTests(false, &context_factory,
+                                         &context_factory_private);
 
-    compositor_.reset(new ui::Compositor(context_factory, task_runner_));
+    compositor_.reset(new ui::Compositor(
+        context_factory, context_factory_private, task_runner_));
     compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
   }
   void TearDown() override {