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

mash/test/mash_test_suite.cc

Index: mash/test/mash_test_suite.cc
diff --git a/mash/test/mash_test_suite.cc b/mash/test/mash_test_suite.cc
index 15715683b4170ee52dcb5d3a391cb597abe6bf61..5d42365d15815067a4811f037af1452926b7dce1 100644
--- a/mash/test/mash_test_suite.cc
+++ b/mash/test/mash_test_suite.cc
@@ -32,8 +32,14 @@ void MashTestSuite::Initialize() {
   env_ = aura::Env::CreateInstance(aura::Env::Mode::MUS);
   gl::GLSurfaceTestSupport::InitializeOneOff();
   const bool enable_pixel_output = false;
-  env_->set_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);
+
+  env_->set_context_factory(context_factory);
+  env_->set_context_factory_private(context_factory_private);
 }
 
 void MashTestSuite::Shutdown() {