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

ui/aura/test/aura_test_base.cc

Index: ui/aura/test/aura_test_base.cc
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 672c3dfe46712ff5c2edb010511a4a410c5a59ad..73254bdd7f809aaeac3f06496b16a2ea0b142ff5 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -74,15 +74,17 @@ void AuraTestBase::SetUp() {
 
   // The ContextFactory must exist before any Compositors are created.
   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;
+  ui::InitializeContextFactoryForTests(enable_pixel_output, &context_factory,
+                                       &context_factory_private);
 
   helper_.reset(new AuraTestHelper(&message_loop_));
   if (use_mus_) {
     helper_->EnableMusWithTestWindowTree(window_tree_client_delegate_,
                                          window_manager_delegate_);
   }
-  helper_->SetUp(context_factory);
+  helper_->SetUp(context_factory, context_factory_private);
 }
 
 void AuraTestBase::TearDown() {