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

services/ui/test_wm/test_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 <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/service_manager/public/c/main.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/service_manager/public/cpp/service_runner.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/property_converter.h"
 #include "ui/aura/mus/property_utils.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/display_list.h"
@@ skipping 10 matching lines @@
  public:
   TestWM() {}
 
   ~TestWM() override {
     // 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);
   }
 
  private:
   // service_manager::Service:
   void OnStart() override {
     CHECK(!started_);
     started_ = true;
     screen_ = base::MakeUnique<display::ScreenBase>();
     display::Screen::SetScreenInstance(screen_.get());
     aura_env_ = aura::Env::CreateInstance(aura::Env::Mode::MUS);
-    gpu_ = ui::Gpu::Create(context()->connector(), nullptr);
-    compositor_context_factory_ =
-        base::MakeUnique<aura::MusContextFactory>(gpu_.get());
-    aura_env_->set_context_factory(compositor_context_factory_.get());
     window_tree_client_ = base::MakeUnique<aura::WindowTreeClient>(
         context()->connector(), this, this);
     aura_env_->SetWindowTreeClient(window_tree_client_.get());
     window_tree_client_->ConnectAsWindowManager();
   }
 
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
     return false;
   }
@@ skipping 102 matching lines @@
   std::unique_ptr<display::ScreenBase> screen_;
 
   std::unique_ptr<aura::Env> aura_env_;
   ::wm::WMState wm_state_;
   aura::PropertyConverter property_converter_;
   aura::test::TestFocusClient focus_client_;
   std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
   aura::Window* root_ = nullptr;
   aura::WindowManagerClient* window_manager_client_ = nullptr;
   std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
-  std::unique_ptr<ui::Gpu> gpu_;
-  std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
 
   bool started_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(TestWM);
 };
 
 }  // namespace test
 }  // namespace ui
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(new ui::test::TestWM);
   return runner.Run(service_request_handle);
 }