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

mash/simple_wm/simple_wm.cc

 // Copyright 2016 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 "mash/simple_wm/simple_wm.h"
 
 #include "base/observer_list.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mash/simple_wm/move_event_handler.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 335 matching lines @@
 
 SimpleWM::SimpleWM() {}
 
 SimpleWM::~SimpleWM() {
   // WindowTreeHost uses state from WindowTreeClient, so destroy it first.
   window_tree_host_.reset();
 
   // WindowTreeClient destruction may callback to us.
   window_tree_client_.reset();
 
-  gpu_.reset();
-
   display::Screen::SetScreenInstance(nullptr);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleWM, service_manager::Service implementation:
 
 void SimpleWM::OnStart() {
   CHECK(!started_);
   started_ = true;
   screen_ = base::MakeUnique<display::ScreenBase>();
   display::Screen::SetScreenInstance(screen_.get());
   aura_init_ = base::MakeUnique<views::AuraInit>(
       context()->connector(), context()->identity(), "views_mus_resources.pak",
       std::string(), nullptr, views::AuraInit::Mode::AURA_MUS_WINDOW_MANAGER);
-  gpu_ = ui::Gpu::Create(context()->connector(), nullptr);
-  compositor_context_factory_ =
-      base::MakeUnique<aura::MusContextFactory>(gpu_.get());
-  aura::Env::GetInstance()->set_context_factory(
-      compositor_context_factory_.get());
   window_tree_client_ = base::MakeUnique<aura::WindowTreeClient>(
       context()->connector(), this, this);
   aura::Env::GetInstance()->SetWindowTreeClient(window_tree_client_.get());
   window_tree_client_->ConnectAsWindowManager();
 }
 
 bool SimpleWM::OnConnect(
     const service_manager::ServiceInfo& remote_info,
     service_manager::InterfaceRegistry* registry) {
   return true;
@@ skipping 204 matching lines @@
 }
 
 void SimpleWM::OnWindowListViewItemActivated(aura::Window* window) {
   window->Show();
   aura::client::ActivationClient* activation_client =
       aura::client::GetActivationClient(window->GetRootWindow());
   activation_client->ActivateWindow(window);
 }
 
 }  // namespace simple_wm