Fix bug in keeping capture in sync during destruction

ui/aura/mus/in_flight_change.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/mus/in_flight_change.h"
 
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/mus/capture_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"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 
 namespace aura {
 
 // InFlightChange -------------------------------------------------------------
 
@@ skipping 87 matching lines @@
 }
 
 void InFlightWindowTreeClientChange::OnWindowDestroyed(Window* window) {
   // NOTE: this has to be in OnWindowDestroyed() as FocusClients typically
   // change focus in OnWindowDestroying().
   SetRevertWindow(nullptr);
 }
 
 // InFlightCaptureChange ------------------------------------------------------
 
-InFlightCaptureChange::InFlightCaptureChange(WindowTreeClient* client,
-                                             WindowMus* revert_value)
-    : InFlightWindowTreeClientChange(client,
-                                     revert_value,
-                                     ChangeType::CAPTURE) {}
+InFlightCaptureChange::InFlightCaptureChange(
+    WindowTreeClient* client,
+    CaptureSynchronizer* capture_synchronizer,
+    WindowMus* revert_value)
+    : InFlightWindowTreeClientChange(client, revert_value, ChangeType::CAPTURE),
+      capture_synchronizer_(capture_synchronizer) {}
 
 InFlightCaptureChange::~InFlightCaptureChange() {}
 
 void InFlightCaptureChange::Revert() {
-  client()->SetCaptureFromServer(revert_window());
+  capture_synchronizer_->SetCaptureFromServer(revert_window());
 }
 
 // InFlightFocusChange --------------------------------------------------------
 
 InFlightFocusChange::InFlightFocusChange(WindowTreeClient* client,
                                          WindowMus* revert_value)
     : InFlightWindowTreeClientChange(client, revert_value, ChangeType::FOCUS) {}
 
 InFlightFocusChange::~InFlightFocusChange() {}
 
@@ skipping 99 matching lines @@
 InFlightSetModalChange::~InFlightSetModalChange() {}
 
 void InFlightSetModalChange::SetRevertValueFrom(const InFlightChange& change) {}
 
 void InFlightSetModalChange::Revert() {
   // TODO: need to support more than just off. http://crbug.com/660073.
   window()->GetWindow()->SetProperty(client::kModalKey, ui::MODAL_TYPE_NONE);
 }
 
 }  // namespace aura