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

ui/views/test/scoped_views_test_helper.cc

 // Copyright 2015 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 "ui/views/test/scoped_views_test_helper.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 15 matching lines @@
     : ScopedViewsTestHelper(base::WrapUnique(new TestViewsDelegate)) {}
 
 ScopedViewsTestHelper::ScopedViewsTestHelper(
     std::unique_ptr<TestViewsDelegate> views_delegate)
     : views_delegate_(std::move(views_delegate)),
       platform_test_helper_(PlatformTestHelper::Create()) {
   // The ContextFactory must exist before any Compositors are created.
   bool enable_pixel_output = false;
 #if defined(USE_AURA)
   ui::ContextFactory* old_context_factory = nullptr;
+  ui::ContextFactoryPrivate* old_context_factory_private = nullptr;
   if (PlatformTestHelper::IsMus()) {
     old_context_factory = aura::Env::GetInstance()->context_factory();
     DCHECK(old_context_factory);
+    old_context_factory_private =
+        aura::Env::GetInstance()->context_factory_private();
   }
 #endif
-  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);
 
   test_helper_.reset(ViewsTestHelper::Create(base::MessageLoopForUI::current(),
-                                             context_factory));
+                                             context_factory,
+                                             context_factory_private));
   platform_test_helper_->OnTestHelperCreated(test_helper_.get());
   test_helper_->SetUp();
 
 #if defined(USE_AURA)
   // When running inside mus, the context-factory from
   // ui::InitializeContextFactoryForTests() is only needed for the default
   // WindowTreeHost instance created by TestScreen. After that, the
   // context-factory is used when creating Widgets (to set-up the compositor for
   // the corresponding ui::Windows). So restore the context-factory (which
   // WindowManagerConnection would have set up), so that NativeWidgetMus
   // installs the correct context-factory that can talk to mus.
-  if (PlatformTestHelper::IsMus())
+  if (PlatformTestHelper::IsMus()) {
     aura::Env::GetInstance()->set_context_factory(old_context_factory);
+    aura::Env::GetInstance()->set_context_factory_private(
+        old_context_factory_private);
+  }
 #endif
 
   ui::InitializeInputMethodForTesting();
   ui::TestClipboard::CreateForCurrentThread();
 }
 
 ScopedViewsTestHelper::~ScopedViewsTestHelper() {
   ui::Clipboard::DestroyClipboardForCurrentThread();
   ui::ShutdownInputMethodForTesting();
   test_helper_->TearDown();
   test_helper_.reset();
 
   views_delegate_.reset();
 
   // The Mus PlatformTestHelper has state that is deleted by
   // ui::TerminateContextFactoryForTests().
   platform_test_helper_.reset();
 
   ui::TerminateContextFactoryForTests();
 }
 
 gfx::NativeWindow ScopedViewsTestHelper::GetContext() {
   return test_helper_->GetContext();
 }
 
 }  // namespace views