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

chrome/test/base/view_event_test_base.cc

Index: chrome/test/base/view_event_test_base.cc
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index 2f7858be8537954b6b5bf18870c84c7d38311dfe..16e9a03bc288ef9937121a24ebe05a837616b6bd 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -74,12 +74,17 @@ void ViewEventTestBase::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);
   views_delegate_.set_context_factory(context_factory);
+  views_delegate_.set_context_factory_private(context_factory_private);
   views_delegate_.set_use_desktop_native_widgets(true);
 
-  platform_part_.reset(ViewEventTestPlatformPart::Create(context_factory));
+  platform_part_.reset(ViewEventTestPlatformPart::Create(
+      context_factory, context_factory_private));
   gfx::NativeWindow context = platform_part_->GetContext();
   window_ = views::Widget::CreateWindowWithContext(this, context);
   window_->Show();