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

ash/mus/window_manager_application.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 "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/mojo_interface_factory.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/wm_shell.h"
 #include "ash/mus/network_connect_delegate_mus.h"
 #include "ash/mus/window_manager.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/system/fake_statistics_provider.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/tracing/public/cpp/provider.h"
 #include "services/ui/common/accelerator_util.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/events/event.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/mus/aura_init.h"
 
 namespace ash {
 namespace mus {
 
 WindowManagerApplication::WindowManagerApplication() {}
 
 WindowManagerApplication::~WindowManagerApplication() {
   // Destroy the WindowManager while still valid. This way we ensure
   // OnWillDestroyRootWindowController() is called (if it hasn't been already).
   window_manager_.reset();
 
   if (blocking_pool_) {
     // Like BrowserThreadImpl, the goal is to make it impossible for ash to
     // 'infinite loop' during shutdown, but to reasonably expect that all
     // BLOCKING_SHUTDOWN tasks queued during shutdown get run. There's nothing
     // particularly scientific about the number chosen.
     const int kMaxNewShutdownBlockingTasks = 1000;
     blocking_pool_->Shutdown(kMaxNewShutdownBlockingTasks);
   }
 
-  gpu_.reset();
   statistics_provider_.reset();
   ShutdownComponents();
 }
 
 void WindowManagerApplication::InitWindowManager(
     std::unique_ptr<aura::WindowTreeClient> window_tree_client,
     const scoped_refptr<base::SequencedWorkerPool>& blocking_pool) {
   // Tests may have already set the WindowTreeClient.
   if (!aura::Env::GetInstance()->HasWindowTreeClient())
     aura::Env::GetInstance()->SetWindowTreeClient(window_tree_client.get());
@@ skipping 39 matching lines @@
   bluez::BluezDBusManager::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
   message_center::MessageCenter::Shutdown();
 }
 
 void WindowManagerApplication::OnStart() {
   aura_init_ = base::MakeUnique<views::AuraInit>(
       context()->connector(), context()->identity(), "ash_mus_resources.pak",
       "ash_mus_resources_200.pak", nullptr,
       views::AuraInit::Mode::AURA_MUS_WINDOW_MANAGER);
-  gpu_ = ui::Gpu::Create(context()->connector());
-  compositor_context_factory_ =
-      base::MakeUnique<aura::MusContextFactory>(gpu_.get());
-  aura::Env::GetInstance()->set_context_factory(
-      compositor_context_factory_.get());
   window_manager_.reset(new WindowManager(context()->connector()));
 
   MaterialDesignController::Initialize();
 
   tracing_.Initialize(context()->connector(), context()->identity().name());
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client =
       base::MakeUnique<aura::WindowTreeClient>(
           context()->connector(), window_manager_.get(), window_manager_.get());
   window_tree_client->ConnectAsWindowManager();
 
   const size_t kMaxNumberThreads = 3u;  // Matches that of content.
   const char kThreadNamePrefix[] = "MashBlocking";
   blocking_pool_ = new base::SequencedWorkerPool(
       kMaxNumberThreads, kThreadNamePrefix, base::TaskPriority::USER_VISIBLE);
   InitWindowManager(std::move(window_tree_client), blocking_pool_);
 }
 
 bool WindowManagerApplication::OnConnect(
     const service_manager::ServiceInfo& remote_info,
     service_manager::InterfaceRegistry* registry) {
   // Register services used in both classic ash and mash.
   mojo_interface_factory::RegisterInterfaces(
       registry, base::ThreadTaskRunnerHandle::Get());
   return true;
 }
 
 }  // namespace mus
 }  // namespace ash