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

ash/mus/window_manager_application.h

Index: ash/mus/window_manager_application.h
diff --git a/ash/mus/window_manager_application.h b/ash/mus/window_manager_application.h
index fef464994e4a315a94c14656c0530fe3c7b23dda..f6596986b026d64519fabf4dfadfd218422e60a8 100644
--- a/ash/mus/window_manager_application.h
+++ b/ash/mus/window_manager_application.h
@@ -19,7 +19,6 @@
 #include "services/ui/common/types.h"
 
 namespace aura {
-class MusContextFactory;
 class WindowTreeClient;
 }
 
@@ -37,10 +36,6 @@ namespace views {
 class AuraInit;
 }
 
-namespace ui {
-class Gpu;
-}
-
 namespace ash {
 namespace mus {
 
@@ -76,8 +71,6 @@ class WindowManagerApplication : public service_manager::Service {
 
   std::unique_ptr<views::AuraInit> aura_init_;
 
-  std::unique_ptr<ui::Gpu> gpu_;
-  std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
   std::unique_ptr<WindowManager> window_manager_;
 
   // A blocking pool used by the WindowManager's shell; not used in tests.