Eliminate WindowTreeConnection

ui/views/mus/window_manager_connection.h

Index: ui/views/mus/window_manager_connection.h
diff --git a/ui/views/mus/window_manager_connection.h b/ui/views/mus/window_manager_connection.h
index 049e09509afb35c23ca2f7a6217e4d5e65610778..928243b5755701b04adb258b7196fcc73912e9a1 100644
--- a/ui/views/mus/window_manager_connection.h
+++ b/ui/views/mus/window_manager_connection.h
@@ -11,7 +11,7 @@
 
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "components/mus/public/cpp/window_tree_delegate.h"
+#include "components/mus/public/cpp/window_tree_client_delegate.h"
 #include "services/shell/public/cpp/identity.h"
 #include "ui/views/mus/mus_export.h"
 #include "ui/views/mus/screen_mus_delegate.h"
@@ -31,14 +31,14 @@ class NativeWidgetDelegate;
 
 // Provides configuration to mus in views. This consists of the following:
 // . Provides a Screen implementation backed by mus.
-// . Creates and owns a WindowTreeConnection.
+// . Creates and owns a WindowTreeClient.
 // . Registers itself as the factory for creating NativeWidgets so that a
 //   NativeWidgetMus is created.
 // WindowManagerConnection is a singleton and should be created early on.
 //
 // TODO(sky): this name is now totally confusing. Come up with a better one.
 class VIEWS_MUS_EXPORT WindowManagerConnection
-    : public NON_EXPORTED_BASE(mus::WindowTreeDelegate),
+    : public NON_EXPORTED_BASE(mus::WindowTreeClientDelegate),
       public ScreenMusDelegate {
  public:
   static void Create(shell::Connector* connector,
@@ -72,9 +72,9 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
   // Returns true if there is one or more pointer watchers for this client.
   bool HasPointerWatcher();
 
-  // mus::WindowTreeDelegate:
+  // mus::WindowTreeClientDelegate:
   void OnEmbed(mus::Window* root) override;
-  void OnConnectionLost(mus::WindowTreeConnection* connection) override;
+  void OnWindowTreeClientDestroyed(mus::WindowTreeClient* client) override;
   void OnEventObserved(const ui::Event& event, mus::Window* target) override;
 
   // ScreenMusDelegate:
@@ -84,7 +84,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
   shell::Connector* connector_;
   shell::Identity identity_;
   std::unique_ptr<ScreenMus> screen_;
-  std::unique_ptr<mus::WindowTreeConnection> window_tree_connection_;
+  std::unique_ptr<mus::WindowTreeClient> client_;
   // Must be empty on destruction.
   base::ObserverList<PointerWatcher, true> pointer_watchers_;