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

services/ui/demo/mus_demo.h

Index: services/ui/demo/mus_demo.h
diff --git a/services/ui/demo/mus_demo.h b/services/ui/demo/mus_demo.h
index 8302eff67add5392a34ef19be7b5f759ffb0504e..c471c188213aaa7b6a4b32803923ebe70c108320 100644
--- a/services/ui/demo/mus_demo.h
+++ b/services/ui/demo/mus_demo.h
@@ -37,9 +37,6 @@ class WMState;
 }
 
 namespace ui {
-class ContextFactory;
-class Gpu;
-
 namespace demo {
 
 // A simple MUS Demo service. This service connects to the service:ui, adds a
@@ -107,8 +104,6 @@ class MusDemo : public service_manager::Service,
   aura::Window* root_window_ = nullptr;
   std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
   std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
-  std::unique_ptr<ui::Gpu> gpu_;
-  std::unique_ptr<ui::ContextFactory> context_factory_;
   std::unique_ptr<aura::Env> env_;
   std::unique_ptr<display::ScreenBase> screen_;