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

ui/aura/test/aura_test_helper.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 "ui/aura/test/aura_test_helper.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/default_capture_client.h"
@@ skipping 58 matching lines @@
 }
 
 void AuraTestHelper::EnableMusWithWindowTreeClient(
     WindowTreeClient* window_tree_client) {
   DCHECK(!setup_called_);
   DCHECK_EQ(Mode::LOCAL, mode_);
   mode_ = Mode::MUS;
   window_tree_client_ = window_tree_client;
 }
 
-void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {
+void AuraTestHelper::SetUp(ui::ContextFactory* context_factory,
+                           ui::ContextFactoryPrivate* context_factory_private) {
   setup_called_ = true;
 
   if (mode_ != Mode::MUS) {
     // Assume if an explicit WindowTreeClient was created then a WmState was
     // already created.
     wm_state_ = base::MakeUnique<wm::WMState>();
   }
   // Needs to be before creating WindowTreeClient.
   focus_client_ = base::MakeUnique<TestFocusClient>();
   capture_client_ = base::MakeUnique<client::DefaultCaptureClient>();
   const Env::Mode env_mode =
       (mode_ == Mode::LOCAL) ? Env::Mode::LOCAL : Env::Mode::MUS;
   if (mode_ == Mode::MUS_CREATE_WINDOW_TREE_CLIENT)
     InitWindowTreeClient();
   if (!Env::GetInstanceDontCreate())
     env_ = Env::CreateInstance(env_mode);
   EnvTestHelper env_helper;
   // Always reset the mode. This really only matters for if Env was created
   // above.
   env_helper.SetMode(env_mode);
   env_helper.SetWindowTreeClient(window_tree_client_);
   Env::GetInstance()->SetActiveFocusClient(focus_client_.get(), nullptr);
   Env::GetInstance()->set_context_factory(context_factory);
+  Env::GetInstance()->set_context_factory_private(context_factory_private);
   // Unit tests generally don't want to query the system, rather use the state
   // from RootWindow.
   env_helper.SetInputStateLookup(nullptr);
   env_helper.ResetEventState();
 
   ui::InitializeInputMethodForTesting();
 
   display::Screen* screen = display::Screen::GetScreen();
   gfx::Size host_size(screen ? screen->GetPrimaryDisplay().GetSizeInPixel()
                              : gfx::Size(800, 600));
@@ skipping 61 matching lines @@
 
 void AuraTestHelper::InitWindowTreeClient() {
   window_tree_client_setup_ = base::MakeUnique<TestWindowTreeClientSetup>();
   window_tree_client_setup_->InitForWindowManager(window_tree_delegate_,
                                                   window_manager_delegate_);
   window_tree_client_ = window_tree_client_setup_->window_tree_client();
 }
 
 }  // namespace test
 }  // namespace aura