Update WindowTreeClientImpl OnWindowDestroying

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

Index: components/mus/public/cpp/lib/window_tree_client_impl.cc
diff --git a/components/mus/public/cpp/lib/window_tree_client_impl.cc b/components/mus/public/cpp/lib/window_tree_client_impl.cc
index 463cd27eeaa2f44af1dd53654be70d977a4ded47..6735cd405ea3ed75799bae65dbb77742b237748f 100644
--- a/components/mus/public/cpp/lib/window_tree_client_impl.cc
+++ b/components/mus/public/cpp/lib/window_tree_client_impl.cc
@@ -434,15 +434,13 @@ void WindowTreeClientImpl::AddWindow(Window* window) {
 }
 
 void WindowTreeClientImpl::OnWindowDestroying(Window* window) {
-  // TODO(jonross): Also clear the focused window (crbug.com/611983)
   if (window == capture_window_) {
-    InFlightCaptureChange reset_change(this, nullptr);
-    ApplyServerChangeToExistingInFlightChange(reset_change);
-    // Normally just updating the queued changes is sufficient. However since

[sadrul, 2016/05/31 18:29:03]

Would it be possible to write a test for this change?

[jonross, 2016/05/31 19:34:01]

Pre-existing tests have coverage:
MenuRunnerTest.WidgetDoesntTakeCapture
WidgetTest.MousePressCausesCapture
WidgetTest.CaptureDuringMousePressNotOverridden
WindowTreeClientImplTest.LostCaptureDifferentInFlightChange

+    // Normally the queue updates itself upon window destruction. However since
     // |window| is being destroyed, it will not be possible to notify its
     // observers of the lost capture. Update local state now.
     LocalSetCapture(nullptr);
   }
+  // For |focused_window_| window destruction clears the entire focus state.
 }
 
 void WindowTreeClientImpl::OnWindowDestroyed(Window* window) {