Reland of Improves focus/activation for aura-mus and DesktopNativeWidgetAura

ui/aura/mus/in_flight_change.cc

Index: ui/aura/mus/in_flight_change.cc
diff --git a/ui/aura/mus/in_flight_change.cc b/ui/aura/mus/in_flight_change.cc
index 52c7e51765327d28059f1bef422ae65a4bb571b2..9fd0eb9b34e17a4bfd1882ea65d004a564bb5c75 100644
--- a/ui/aura/mus/in_flight_change.cc
+++ b/ui/aura/mus/in_flight_change.cc
@@ -6,6 +6,7 @@
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/mus/capture_synchronizer.h"
+#include "ui/aura/mus/focus_synchronizer.h"
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/mus/window_tree_client.h"
@@ -129,13 +130,15 @@
 // InFlightFocusChange --------------------------------------------------------
 
 InFlightFocusChange::InFlightFocusChange(WindowTreeClient* client,
+                                         FocusSynchronizer* focus_synchronizer,
                                          WindowMus* revert_value)
-    : InFlightWindowTreeClientChange(client, revert_value, ChangeType::FOCUS) {}
+    : InFlightWindowTreeClientChange(client, revert_value, ChangeType::FOCUS),
+      focus_synchronizer_(focus_synchronizer) {}
 
 InFlightFocusChange::~InFlightFocusChange() {}
 
 void InFlightFocusChange::Revert() {
-  client()->SetFocusFromServer(revert_window());
+  focus_synchronizer_->SetFocusFromServer(revert_window());
 }
 
 // InFlightPropertyChange -----------------------------------------------------