Changes ownership of WindowTreeClient

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 192007586cb23a92fa7815f00773da841bc47c47..3af714f0c1f1e0828702b9f68844d5f9d66c8266 100644
--- a/services/ui/demo/mus_demo.h
+++ b/services/ui/demo/mus_demo.h
@@ -43,7 +43,8 @@ class MusDemo : public shell::Service,
 
   // WindowTreeClientDelegate:
   void OnEmbed(Window* root) override;
-  void OnDidDestroyClient(WindowTreeClient* client) override;
+  void OnEmbedRootDestroyed(Window* root) override;
+  void OnLostConnection(WindowTreeClient* client) override;
   void OnPointerEventObserved(const PointerEvent& event,
                               Window* target) override;
 
@@ -72,11 +73,11 @@ class MusDemo : public shell::Service,
   void DrawFrame();
 
   Window* window_ = nullptr;
-  WindowTreeClient* window_tree_client_ = nullptr;
+  std::unique_ptr<WindowTreeClient> window_tree_client_;
   std::unique_ptr<GpuService> gpu_service_;
 
   // Used to send frames to mus.
-  std::unique_ptr<ui::BitmapUploader> uploader_;
+  std::unique_ptr<BitmapUploader> uploader_;
 
   // Bitmap that is the same size as our client window area.
   SkBitmap bitmap_;