Fixes coordinates supplied to WindowTreeHost

ui/aura/test/mus/test_window_tree.h

 // 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.
 
 #ifndef UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_
 #define UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_
 
 #include <stdint.h>
 
-#include <set>
+#include <vector>
 
 #include "base/macros.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "ui/aura/mus/mus_types.h"
 
 namespace aura {
 
 enum class WindowTreeChangeType {
   ADD_TRANSIENT,
   BOUNDS,
@@ skipping 24 matching lines @@
  public:
   TestWindowTree();
   ~TestWindowTree() override;
 
   void set_client(ui::mojom::WindowTreeClient* client) { client_ = client; }
 
   uint32_t window_id() const { return window_id_; }
 
   bool WasEventAcked(uint32_t event_id) const;
 
+  // Returns the result of the specified event. UNHANDLED if |event_id| was
+  // not acked (use WasEventAcked() to determine if the event was acked).
+  ui::mojom::EventResult GetEventResult(uint32_t event_id) const;
+
   base::Optional<std::vector<uint8_t>> GetLastPropertyValue();
 
   base::Optional<std::unordered_map<std::string, std::vector<uint8_t>>>
   GetLastNewWindowProperties();
 
   // True if at least one function has been called that takes a change id.
   bool has_change() const { return !changes_.empty(); }
 
   size_t number_of_changes() const { return changes_.size(); }
 
@@ skipping 118 matching lines @@
       uint32_t source_window_id,
       const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data,
       uint32_t drag_operation) override;
   void CancelDragDrop(uint32_t window_id) override;
   void PerformWindowMove(uint32_t change_id,
                          uint32_t window_id,
                          ui::mojom::MoveLoopSource source,
                          const gfx::Point& cursor_location) override;
   void CancelWindowMove(uint32_t window_id) override;
 
-  std::set<uint32_t> acked_events_;
+  struct AckedEvent {
+    uint32_t event_id;
+    ui::mojom::EventResult result;
+  };
+  std::vector<AckedEvent> acked_events_;
   uint32_t window_id_ = 0u;
 
   base::Optional<std::vector<uint8_t>> last_property_value_;
 
   std::vector<Change> changes_;
 
   ui::mojom::WindowTreeClient* client_;
 
   base::Optional<std::unordered_map<std::string, std::vector<uint8_t>>>
       last_new_window_properties_;
 
   TransientData transient_data_;
 
   gfx::Insets last_client_area_;
 
   base::Optional<gfx::Rect> last_hit_test_mask_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowTree);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_