Make event-targeting asynchronous in window server.

services/ui/ws/test_utils.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 189 matching lines @@
 
 // -----------------------------------------------------------------------------
 
 class WindowManagerStateTestApi {
  public:
   explicit WindowManagerStateTestApi(WindowManagerState* wms) : wms_(wms) {}
   ~WindowManagerStateTestApi() {}
 
   void DispatchInputEventToWindow(ServerWindow* target,
                                   ClientSpecificId client_id,
-                                  const int64_t display_id,
+                                  int64_t display_id,
                                   const ui::Event& event,
                                   Accelerator* accelerator) {
     wms_->DispatchInputEventToWindow(target, client_id, display_id, event,
                                      accelerator);
   }
 
   ClientSpecificId GetEventTargetClientId(ServerWindow* window,
                                           bool in_nonclient_area) {
     return wms_->GetEventTargetClientId(window, in_nonclient_area);
   }
 
   void ProcessEvent(const ui::Event& event, int64_t display_id = 0) {
     wms_->ProcessEvent(event, display_id);
   }
 
   void OnEventAckTimeout(ClientSpecificId client_id) {
     wms_->OnEventAckTimeout(client_id);
   }
 
   ClientSpecificId GetEventTargetClientId(const ServerWindow* window,
                                           bool in_nonclient_area) {
     return wms_->GetEventTargetClientId(window, in_nonclient_area);
   }
 
   WindowTree* tree_awaiting_input_ack() {
-    return wms_->in_flight_event_details_ ? wms_->in_flight_event_details_->tree
-                                          : nullptr;
+    return wms_->in_flight_event_dispatch_details_
+               ? wms_->in_flight_event_dispatch_details_->tree
+               : nullptr;
   }
 
+  bool is_event_queue_empty() const { return wms_->event_queue_.empty(); }
+
   const std::vector<std::unique_ptr<WindowManagerDisplayRoot>>&
   window_manager_display_roots() const {
     return wms_->window_manager_display_roots_;
   }
 
   bool AckInFlightEvent(mojom::EventResult result) {
-    if (!wms_->in_flight_event_details_)
+    if (!wms_->in_flight_event_dispatch_details_)
       return false;
-    wms_->OnEventAck(wms_->in_flight_event_details_->tree, result);
+    wms_->OnEventAck(wms_->in_flight_event_dispatch_details_->tree, result);
     return true;
   }
 
  private:
   WindowManagerState* wms_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerStateTestApi);
 };
 
 // -----------------------------------------------------------------------------
@@ skipping 497 matching lines @@
                               ClientWindowId* client_id = nullptr);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id = nullptr);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_