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

services/ui/test_wm/test_wm.cc

Index: services/ui/test_wm/test_wm.cc
diff --git a/services/ui/test_wm/test_wm.cc b/services/ui/test_wm/test_wm.cc
index 7ca9138e27913189bbcf12e864dd0a9918820cd5..f678e0288e1c74da4fb5565a2abd44872a644544 100644
--- a/services/ui/test_wm/test_wm.cc
+++ b/services/ui/test_wm/test_wm.cc
@@ -13,9 +13,7 @@
 #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"
@@ -46,8 +44,6 @@ class TestWM : public service_manager::Service,
     // WindowTreeClient destruction may callback to us.
     window_tree_client_.reset();
 
-    gpu_.reset();
-
     display::Screen::SetScreenInstance(nullptr);
   }
 
@@ -59,10 +55,6 @@ class TestWM : public service_manager::Service,
     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());
@@ -185,8 +177,6 @@ class TestWM : public service_manager::Service,
   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;