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

ui/compositor/layer_owner_unittest.cc

Index: ui/compositor/layer_owner_unittest.cc
diff --git a/ui/compositor/layer_owner_unittest.cc b/ui/compositor/layer_owner_unittest.cc
index 5e81fe98426e511eaa21bd0d059383d136ee5125..7675806d858fbb21e811545587f108606ff0f90e 100644
--- a/ui/compositor/layer_owner_unittest.cc
+++ b/ui/compositor/layer_owner_unittest.cc
@@ -71,10 +71,14 @@ void LayerOwnerTestWithCompositor::SetUp() {
   scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       new base::NullTaskRunner();
 
-  ui::ContextFactory* context_factory =
-      ui::InitializeContextFactoryForTests(false);
+  ui::ContextFactory* context_factory = nullptr;
+  ui::ContextFactoryPrivate* context_factory_private = nullptr;
 
-  compositor_.reset(new ui::Compositor(context_factory, task_runner));
+  ui::InitializeContextFactoryForTests(false, &context_factory,
+                                       &context_factory_private);
+
+  compositor_.reset(new ui::Compositor(context_factory, context_factory_private,
+                                       task_runner));
   compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
 }