Eliminate WindowTreeConnection

components/mus/public/cpp/lib/scoped_window_ptr.cc

Index: components/mus/public/cpp/lib/scoped_window_ptr.cc
diff --git a/components/mus/public/cpp/lib/scoped_window_ptr.cc b/components/mus/public/cpp/lib/scoped_window_ptr.cc
index 1c7e1f4998d97e5bc62d41d173bb888cef852588..360da1ff4b591f34077325572f0e195d1541814d 100644
--- a/components/mus/public/cpp/lib/scoped_window_ptr.cc
+++ b/components/mus/public/cpp/lib/scoped_window_ptr.cc
@@ -6,7 +6,7 @@
 
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_observer.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 
 namespace mus {
 
@@ -22,8 +22,8 @@ ScopedWindowPtr::~ScopedWindowPtr() {
 
 // static
 void ScopedWindowPtr::DeleteWindowOrWindowManager(Window* window) {
-  if (window->connection()->GetRoots().count(window) > 0)
-    delete window->connection();
+  if (window->window_tree()->GetRoots().count(window) > 0)
+    delete window->window_tree();
   else
     window->Destroy();
 }