Eliminate WindowTreeConnection

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

Index: components/mus/public/cpp/lib/in_flight_change.cc
diff --git a/components/mus/public/cpp/lib/in_flight_change.cc b/components/mus/public/cpp/lib/in_flight_change.cc
index db2e0a79c1d17dd565d358fd658ab1ec38c69746..27b4a69968e7d0ddfed2ed1666cf6d8706ca367d 100644
--- a/components/mus/public/cpp/lib/in_flight_change.cc
+++ b/components/mus/public/cpp/lib/in_flight_change.cc
@@ -5,8 +5,7 @@
 #include "components/mus/public/cpp/lib/in_flight_change.h"
 
 #include "components/mus/public/cpp/lib/window_private.h"
-#include "components/mus/public/cpp/lib/window_tree_client_impl.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 
 namespace mus {
 
@@ -62,11 +61,11 @@ void CrashInFlightChange::Revert() {
 // InFlightWindowChange -------------------------------------------------------
 
 InFlightWindowTreeClientChange::InFlightWindowTreeClientChange(
-    WindowTreeClientImpl* client_connection,
+    WindowTreeClient* client,
     Window* revert_value,
     ChangeType type)
     : InFlightChange(nullptr, type),
-      connection_(client_connection),
+      client_(client),
       revert_window_(nullptr) {
   SetRevertWindow(revert_value);
 }
@@ -96,31 +95,30 @@ void InFlightWindowTreeClientChange::OnWindowDestroying(Window* window) {
 // InFlightCaptureChange ------------------------------------------------------
 
 InFlightCaptureChange::InFlightCaptureChange(
-    WindowTreeClientImpl* client_connection,
-    Window* revert_value)
-    : InFlightWindowTreeClientChange(client_connection,
+    WindowTreeClient* client, Window* revert_value)
+    : InFlightWindowTreeClientChange(client,
                                      revert_value,
                                      ChangeType::CAPTURE) {}
 
 InFlightCaptureChange::~InFlightCaptureChange() {}
 
 void InFlightCaptureChange::Revert() {
-  connection()->LocalSetCapture(revert_window());
+  client()->LocalSetCapture(revert_window());
 }
 
 // InFlightFocusChange --------------------------------------------------------
 
 InFlightFocusChange::InFlightFocusChange(
-    WindowTreeClientImpl* client_connection,
+    WindowTreeClient* client,
     Window* revert_value)
-    : InFlightWindowTreeClientChange(client_connection,
+    : InFlightWindowTreeClientChange(client,
                                      revert_value,
                                      ChangeType::FOCUS) {}
 
 InFlightFocusChange::~InFlightFocusChange() {}
 
 void InFlightFocusChange::Revert() {
-  connection()->LocalSetFocus(revert_window());
+  client()->LocalSetFocus(revert_window());
 }
 
 // InFlightPropertyChange -----------------------------------------------------