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

ui/views/test/views_test_helper_aura.cc

Index: ui/views/test/views_test_helper_aura.cc
diff --git a/ui/views/test/views_test_helper_aura.cc b/ui/views/test/views_test_helper_aura.cc
index 1c8c99a821f090450c56423679ab8a8c74447651..f9fe6f1b125fc9759753a0183ecc4d51087a8a54 100644
--- a/ui/views/test/views_test_helper_aura.cc
+++ b/ui/views/test/views_test_helper_aura.cc
@@ -14,14 +14,20 @@
 namespace views {
 
 // static
-ViewsTestHelper* ViewsTestHelper::Create(base::MessageLoopForUI* message_loop,
-                                         ui::ContextFactory* context_factory) {
-  return new ViewsTestHelperAura(message_loop, context_factory);
+ViewsTestHelper* ViewsTestHelper::Create(
+    base::MessageLoopForUI* message_loop,
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private) {
+  return new ViewsTestHelperAura(message_loop, context_factory,
+                                 context_factory_private);
 }
 
-ViewsTestHelperAura::ViewsTestHelperAura(base::MessageLoopForUI* message_loop,
-                                         ui::ContextFactory* context_factory)
-    : context_factory_(context_factory) {
+ViewsTestHelperAura::ViewsTestHelperAura(
+    base::MessageLoopForUI* message_loop,
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private)
+    : context_factory_(context_factory),
+      context_factory_private_(context_factory_private) {
   aura_test_helper_.reset(new aura::test::AuraTestHelper(message_loop));
 }
 
@@ -34,7 +40,7 @@ void ViewsTestHelperAura::EnableMusWithWindowTreeClient(
 }
 
 void ViewsTestHelperAura::SetUp() {
-  aura_test_helper_->SetUp(context_factory_);
+  aura_test_helper_->SetUp(context_factory_, context_factory_private_);
 
   // GetContext() may return null. See comment in GetContext().
   gfx::NativeWindow root_window = GetContext();