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

ui/views/test/views_test_helper.h

Index: ui/views/test/views_test_helper.h
diff --git a/ui/views/test/views_test_helper.h b/ui/views/test/views_test_helper.h
index d2796b37a1a07bcef81b1ce1c8901a292c9f2c31..787648dc04595fcee8c078d6a170148e9c9718db 100644
--- a/ui/views/test/views_test_helper.h
+++ b/ui/views/test/views_test_helper.h
@@ -14,6 +14,7 @@ class MessageLoopForUI;
 
 namespace ui {
 class ContextFactory;
+class ContextFactoryPrivate;
 }
 
 namespace views {
@@ -26,8 +27,10 @@ class ViewsTestHelper {
   virtual ~ViewsTestHelper();
 
   // Create a platform specific instance.
-  static ViewsTestHelper* Create(base::MessageLoopForUI* message_loop,
-                                 ui::ContextFactory* context_factory);
+  static ViewsTestHelper* Create(
+      base::MessageLoopForUI* message_loop,
+      ui::ContextFactory* context_factory,
+      ui::ContextFactoryPrivate* context_factory_private);
 
   // Creates objects that are needed for tests.
   virtual void SetUp();