aura: Some change to how the client-lib is set up.

services/ui/ws/window_server_test_base.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 "services/ui/ws/window_server_test_base.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
-#include "services/ui/public/cpp/gpu/gpu.h"
 #include "ui/aura/env.h"
-#include "ui/aura/mus/mus_context_factory.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/display/display.h"
 #include "ui/display/display_list.h"
 #include "ui/wm/core/capture_controller.h"
 
 namespace ui {
 namespace {
 
 base::RunLoop* current_run_loop = nullptr;
@@ skipping 57 matching lines @@
   std::unique_ptr<aura::WindowTreeClient> result =
       std::move(window_tree_clients_.back());
   window_tree_clients_.pop_back();
   return result;
 }
 
 void WindowServerTestBase::SetUp() {
   WindowServerServiceTestBase::SetUp();
 
   env_ = aura::Env::CreateInstance(aura::Env::Mode::MUS);
-  gpu_ = ui::Gpu::Create(connector(), nullptr);
-  compositor_context_factory_ =
-      base::MakeUnique<aura::MusContextFactory>(gpu_.get());
-  env_->set_context_factory(compositor_context_factory_.get());
   display::Screen::SetScreenInstance(&screen_);
   std::unique_ptr<aura::WindowTreeClient> window_manager_window_tree_client =
-      base::MakeUnique<aura::WindowTreeClient>(connector(), this, this);
+      base::MakeUnique<aura::WindowTreeClient>(connector(), nullptr, this,
+                                               this);
   window_manager_window_tree_client->ConnectAsWindowManager();
   window_manager_ = window_manager_window_tree_client.get();
   window_tree_clients_.push_back(std::move(window_manager_window_tree_client));
 
   // Connecting as the WindowManager results in OnWmNewDisplay() being called
   // with the display (and root). Wait for it to be called so we have display
   // and root window information (otherwise we can't really do anything).
   ASSERT_TRUE(DoRunLoopWithTimeout());
 }
 
 void WindowServerTestBase::TearDown() {
   // WindowTreeHost depends on WindowTreeClient.
   window_tree_hosts_.clear();
   window_tree_clients_.clear();
   env_.reset();
-  gpu_.reset();
   display::Screen::SetScreenInstance(nullptr);
 
   WindowServerServiceTestBase::TearDown();
 }
 
 bool WindowServerTestBase::OnConnect(
     const service_manager::Identity& remote_identity,
     service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::WindowTreeClient>(this);
   return true;
@@ skipping 141 matching lines @@
 
 void WindowServerTestBase::OnWmDeactivateWindow(aura::Window* window) {
   if (window_manager_delegate_)
     window_manager_delegate_->OnWmDeactivateWindow(window);
 }
 
 void WindowServerTestBase::Create(
     const service_manager::Identity& remote_identity,
     mojom::WindowTreeClientRequest request) {
   window_tree_clients_.push_back(base::MakeUnique<aura::WindowTreeClient>(
-      connector(), this, nullptr, std::move(request)));
+      connector(), nullptr, this, nullptr, std::move(request)));
 }
 
 bool WindowServerTestBase::DeleteWindowTreeHost(
     aura::WindowTreeHostMus* window_tree_host) {
   for (auto iter = window_tree_hosts_.begin(); iter != window_tree_hosts_.end();
        ++iter) {
     if ((*iter).get() == window_tree_host) {
       window_tree_hosts_.erase(iter);
       return true;
     }
   }
   return false;
 }
 
 }  // namespace ui