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

mash/simple_wm/simple_wm.h

Index: mash/simple_wm/simple_wm.h
diff --git a/mash/simple_wm/simple_wm.h b/mash/simple_wm/simple_wm.h
index 74fb7fc29fdeb81ed3f7671b7bf2ba64f9fa6cb9..dc558426a5f19d2a22bb937a554dd5914c79a39e 100644
--- a/mash/simple_wm/simple_wm.h
+++ b/mash/simple_wm/simple_wm.h
@@ -14,9 +14,7 @@
 #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/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"
@@ -122,8 +120,6 @@ class SimpleWM : public service_manager::Service,
   aura::Window* 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_;
   std::map<aura::Window*, FrameView*> client_window_to_frame_view_;
   std::unique_ptr<WindowListModel> window_list_model_;
   std::unique_ptr<WorkspaceLayoutManager> workspace_layout_manager_;