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

services/ui/ws/window_server_test_base.h

Index: services/ui/ws/window_server_test_base.h
diff --git a/services/ui/ws/window_server_test_base.h b/services/ui/ws/window_server_test_base.h
index 98a08fa2c1d50c09a06d8c732e0be1bbfef64c0b..a2a72e503972b6afcc83c3bce3ac872f7884dc61 100644
--- a/services/ui/ws/window_server_test_base.h
+++ b/services/ui/ws/window_server_test_base.h
@@ -20,11 +20,9 @@
 
 namespace aura {
 class Env;
-class MusContextFactory;
 }
 
 namespace ui {
-class Gpu;
 
 // WindowServerTestBase is a base class for use with shell tests that use
 // WindowServer. SetUp() connects to the WindowServer and blocks until OnEmbed()
@@ -135,9 +133,6 @@ class WindowServerTestBase
   display::ScreenBase screen_;
   aura::PropertyConverter property_converter_;
 
-  std::unique_ptr<Gpu> gpu_;
-  std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
-
   std::vector<std::unique_ptr<aura::WindowTreeClient>> window_tree_clients_;
 
   std::vector<std::unique_ptr<aura::WindowTreeHostMus>> window_tree_hosts_;