Converts test_wm to use aura

ui/aura/mus/window_tree_client.h

Index: ui/aura/mus/window_tree_client.h
diff --git a/ui/aura/mus/window_tree_client.h b/ui/aura/mus/window_tree_client.h
index f9835fe486dd0e8548e9a172993238e68ab08af7..c43275925da27f33d887c28e3c71a34be8d9b66d 100644
--- a/ui/aura/mus/window_tree_client.h
+++ b/ui/aura/mus/window_tree_client.h
@@ -164,6 +164,11 @@ class AURA_EXPORT WindowTreeClient
   friend class WindowPortMus;
   friend class WindowTreeClientPrivate;
 
+  enum class Origin {
+    CLIENT,
+    SERVER,
+  };
+
   using IdToWindowMap = std::map<Id, WindowMus*>;
 
   // TODO(sky): this assumes change_ids never wrap, which is a bad assumption.
@@ -254,7 +259,7 @@ class AURA_EXPORT WindowTreeClient
 
   // Following are called from WindowMus.
   void OnWindowMusCreated(WindowMus* window);
-  void OnWindowMusDestroyed(WindowMus* window);
+  void OnWindowMusDestroyed(WindowMus* window, Origin origin);
   void OnWindowMusBoundsChanged(WindowMus* window,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds);