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

chrome/test/base/view_event_test_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/view_event_test_base.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 56 matching lines @@
 void ViewEventTestBase::SetUpTestCase() {
   ChromeUnitTestSuite::InitializeProviders();
   ChromeUnitTestSuite::InitializeResourceBundle();
 }
 
 void ViewEventTestBase::SetUp() {
   ui::InitializeInputMethodForTesting();
 
   // 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();
 }
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
     window_->Close();
     content::RunAllPendingInMessageLoop();
     window_ = NULL;
@@ skipping 68 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }