Converts ash to use aura-mus

ash/mus/disconnected_app_handler.h

Index: ash/mus/disconnected_app_handler.h
diff --git a/ash/mus/disconnected_app_handler.h b/ash/mus/disconnected_app_handler.h
index 8a1abef7c9c5c1da54532ee4c8cb05fec1687550..1460fb74106b4d6da5fa11c46e130f5623718b8d 100644
--- a/ash/mus/disconnected_app_handler.h
+++ b/ash/mus/disconnected_app_handler.h
@@ -6,22 +6,22 @@
 #define ASH_MUS_DISCONNECTED_APP_HANDLER_H_
 
 #include "base/macros.h"
-#include "services/ui/public/cpp/window_tracker.h"
+#include "ui/aura/window_tracker.h"
 
 namespace ash {
 namespace mus {
 
 // Tracks ui::Windows for when they get disconnected from the embedded app.

[James Cook, 2016/12/05 19:21:44]

ui::Windows?

[sky, 2016/12/05 21:39:19]

Done.

 // Destroys the window upon disconnection.
-class DisconnectedAppHandler : public ui::WindowTracker {
+class DisconnectedAppHandler : public aura::WindowTracker {
  public:
-  explicit DisconnectedAppHandler(ui::Window* root_window);
+  explicit DisconnectedAppHandler(aura::Window* root_window);
   ~DisconnectedAppHandler() override;
 
  private:
-  // ui::WindowObserver:
-  void OnWindowEmbeddedAppDisconnected(ui::Window* window) override;
-  void OnTreeChanging(const TreeChangeParams& params) override;
+  // aura::WindowObserver:
+  void OnEmbeddedAppDisconnected(aura::Window* window) override;
+  void OnWindowHierarchyChanging(const HierarchyChangeParams& params) override;
 
   DISALLOW_COPY_AND_ASSIGN(DisconnectedAppHandler);
 };