Eliminate WindowTreeConnection

mash/wm/bridge/wm_globals_mus.h

Index: mash/wm/bridge/wm_globals_mus.h
diff --git a/mash/wm/bridge/wm_globals_mus.h b/mash/wm/bridge/wm_globals_mus.h
index d99afaac6953783a85cdfe3fa6b2435548930524..658b97ba65ac9688fb05d42e08638f21b21e0d74 100644
--- a/mash/wm/bridge/wm_globals_mus.h
+++ b/mash/wm/bridge/wm_globals_mus.h
@@ -12,10 +12,10 @@
 #include "ash/wm/common/wm_globals.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "components/mus/public/cpp/window_tree_connection_observer.h"
+#include "components/mus/public/cpp/window_tree_client_observer.h"
 
 namespace mus {
-class WindowTreeConnection;
+class WindowTreeClient;
 }
 
 namespace mash {
@@ -26,9 +26,9 @@ class WmWindowMus;
 
 // WmGlobals implementation for mus.
 class WmGlobalsMus : public ash::wm::WmGlobals,
-                     public mus::WindowTreeConnectionObserver {
+                     public mus::WindowTreeClientObserver {
  public:
-  explicit WmGlobalsMus(mus::WindowTreeConnection* connection);
+  explicit WmGlobalsMus(mus::WindowTreeClient* client);
   ~WmGlobalsMus() override;
 
   static WmGlobalsMus* Get();
@@ -74,14 +74,14 @@ class WmGlobalsMus : public ash::wm::WmGlobals,
   // Returns true if |window| is a window that can have active children.
   static bool IsActivationParent(mus::Window* window);
 
-  void RemoveConnectionObserver();
+  void RemoveClientObserver();
 
-  // mus::WindowTreeConnectionObserver:
+  // mus::WindowTreeClientObserver:
   void OnWindowTreeFocusChanged(mus::Window* gained_focus,
                                 mus::Window* lost_focus) override;
-  void OnWillDestroyConnection(mus::WindowTreeConnection* connection) override;
+  void OnWillDestroyClient(mus::WindowTreeClient* client) override;
 
-  mus::WindowTreeConnection* connection_;
+  mus::WindowTreeClient* client_;
 
   std::vector<WmRootWindowControllerMus*> root_window_controllers_;