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

ui/views/mus/mus_client.h

Index: ui/views/mus/mus_client.h
diff --git a/ui/views/mus/mus_client.h b/ui/views/mus/mus_client.h
index 075450b04f050a954fa752118cd1958fdb384f21..72792a72c520077a42ff6d760307bdc04bb16de2 100644
--- a/ui/views/mus/mus_client.h
+++ b/ui/views/mus/mus_client.h
@@ -20,7 +20,6 @@
 
 namespace aura {
 class PropertyConverter;
-class MusContextFactory;
 class Window;
 class WindowTreeClient;
 }
@@ -39,10 +38,6 @@ class Connector;
 class Identity;
 }
 
-namespace ui {
-class Gpu;
-}
-
 namespace wm {
 class WMState;
 }
@@ -100,8 +95,6 @@ class VIEWS_MUS_EXPORT MusClient
     return pointer_watcher_event_router_.get();
   }
 
-  ui::Gpu* gpu() { return gpu_.get(); }
-
   // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is
   // set as the factory function used for creating NativeWidgets when a
   //  NativeWidget has not been explicitly set.
@@ -150,12 +143,8 @@ class VIEWS_MUS_EXPORT MusClient
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
 
-  std::unique_ptr<ui::Gpu> gpu_;
-
   std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_;
 
-  std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
-
   std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager>
       discardable_shared_memory_manager_;