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

chrome/test/base/view_event_test_platform_part_default.cc

Index: chrome/test/base/view_event_test_platform_part_default.cc
diff --git a/chrome/test/base/view_event_test_platform_part_default.cc b/chrome/test/base/view_event_test_platform_part_default.cc
index aabd0fb4d68eab4d27de7a010248baca8e3f6a53..8d32515c4239b70af98b4a94ae3ea1a6080bec0f 100644
--- a/chrome/test/base/view_event_test_platform_part_default.cc
+++ b/chrome/test/base/view_event_test_platform_part_default.cc
@@ -19,8 +19,9 @@ namespace {
 // ViewEventTestPlatformPart implementation for Views, but non-CrOS.
 class ViewEventTestPlatformPartDefault : public ViewEventTestPlatformPart {
  public:
-  explicit ViewEventTestPlatformPartDefault(
-      ui::ContextFactory* context_factory) {
+  ViewEventTestPlatformPartDefault(
+      ui::ContextFactory* context_factory,
+      ui::ContextFactoryPrivate* context_factory_private) {
 #if defined(USE_AURA)
     DCHECK(!display::Screen::GetScreen());
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
@@ -32,6 +33,7 @@ class ViewEventTestPlatformPartDefault : public ViewEventTestPlatformPart {
 #endif
     env_ = aura::Env::CreateInstance();
     env_->set_context_factory(context_factory);
+    env_->set_context_factory_private(context_factory_private);
 #endif
   }
 
@@ -56,6 +58,8 @@ class ViewEventTestPlatformPartDefault : public ViewEventTestPlatformPart {
 
 // static
 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create(
-    ui::ContextFactory* context_factory) {
-  return new ViewEventTestPlatformPartDefault(context_factory);
+    ui::ContextFactory* context_factory,
+    ui::ContextFactoryPrivate* context_factory_private) {
+  return new ViewEventTestPlatformPartDefault(context_factory,
+                                              context_factory_private);
 }