Add PointerDetails to ui::MouseEvent's constructors

services/ui/ws/window_manager_state_unittest.cc

 // 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.
 
 #include "services/ui/ws/window_manager_state.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 435 matching lines @@
   EXPECT_FALSE(target_window_manager.on_accelerator_called());
   EXPECT_TRUE(window_manager()->on_accelerator_called());
 }
 
 // Tests that if a tree is destroyed before acking an event, that mus won't
 // then try to send any queued events.
 TEST_F(WindowManagerStateTest, DontSendQueuedEventsToADeadTree) {
   ServerWindow* target = window();
   TestChangeTracker* tracker = window_tree_client()->tracker();
 
-  ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(5, 5), gfx::Point(5, 5),
-                       base::TimeTicks(), EF_LEFT_MOUSE_BUTTON,
-                       EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent press(
+      ui::ET_MOUSE_PRESSED, gfx::Point(5, 5), gfx::Point(5, 5),
+      base::TimeTicks(), EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchInputEventToWindow(target, press, nullptr);
   ASSERT_EQ(1u, tracker->changes()->size());
   EXPECT_EQ("InputEvent window=1,1 event_action=1",
             ChangesToDescription1(*tracker->changes())[0]);
   tracker->changes()->clear();
   // The above is not setting TreeAwaitingInputAck.
 
   // Queue the key release event; it should not be immediately dispatched
   // because there's no ACK for the last one.
-  ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(5, 5),
-                         gfx::Point(5, 5), base::TimeTicks(),
-                         EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent release(
+      ui::ET_MOUSE_RELEASED, gfx::Point(5, 5), gfx::Point(5, 5),
+      base::TimeTicks(), EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchInputEventToWindow(target, release, nullptr);
   EXPECT_EQ(0u, tracker->changes()->size());
 
   // Destroying a window tree with an event in queue shouldn't crash.
   DestroyWindowTree();
 }
 
 // Tests that when an ack times out that the accelerator is notified.
 TEST_F(WindowManagerStateTest, AckTimeout) {
   ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_CONTROL_DOWN);
@@ skipping 26 matching lines @@
   {
     // Do a normal embed.
     const uint32_t embed_flags = 0;
     WindowTree* embed_tree = nullptr;
     TestWindowTreeClient* embed_client_proxy = nullptr;
     EmbedAt(embedder_tree, embed_window_id, embed_flags, &embed_tree,
             &embed_client_proxy);
     ASSERT_TRUE(embed_client_proxy);
 
     // Send an event to the embed window. It should go to the embedded client.
-    ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(),
-                         base::TimeTicks(), 0, 0);
+    ui::MouseEvent mouse(
+        ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), base::TimeTicks(), 0, 0,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     DispatchInputEventToWindow(embedder_window, mouse, nullptr);
     ASSERT_EQ(1u, embed_client_proxy->tracker()->changes()->size());
     EXPECT_EQ(CHANGE_TYPE_INPUT_EVENT,
               (*embed_client_proxy->tracker()->changes())[0].type);
     WindowTreeTestApi(embed_tree).AckLastEvent(mojom::EventResult::UNHANDLED);
     embed_client_proxy->tracker()->changes()->clear();
   }
 
   {
     // Do an embed where the embedder wants to intercept events to the embedded
     // tree.
     const uint32_t embed_flags = mojom::kEmbedFlagEmbedderInterceptsEvents;
     WindowTree* embed_tree = nullptr;
     TestWindowTreeClient* embed_client_proxy = nullptr;
     EmbedAt(embedder_tree, embed_window_id, embed_flags, &embed_tree,
             &embed_client_proxy);
     ASSERT_TRUE(embed_client_proxy);
     embedder_client->tracker()->changes()->clear();
 
     // Send an event to the embed window. But this time, it should reach the
     // embedder.
-    ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(),
-                         base::TimeTicks(), 0, 0);
+    ui::MouseEvent mouse(
+        ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), base::TimeTicks(), 0, 0,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     DispatchInputEventToWindow(embedder_window, mouse, nullptr);
     ASSERT_EQ(0u, embed_client_proxy->tracker()->changes()->size());
     ASSERT_EQ(1u, embedder_client->tracker()->changes()->size());
     EXPECT_EQ(CHANGE_TYPE_INPUT_EVENT,
               (*embedder_client->tracker()->changes())[0].type);
     WindowTreeTestApi(embedder_tree)
         .AckLastEvent(mojom::EventResult::UNHANDLED);
     embedder_client->tracker()->changes()->clear();
 
     // Embed another tree in the embedded tree.
@@ skipping 10 matching lines @@
             &nested_embed_client_proxy);
     ASSERT_TRUE(nested_embed_client_proxy);
     embed_client_proxy->tracker()->changes()->clear();
     embedder_client->tracker()->changes()->clear();
 
     // Send an event to the nested embed window. The event should still reach
     // the outermost embedder.
     ServerWindow* nested_embed_window =
         embed_tree->GetWindowByClientId(nested_embed_window_id);
     DCHECK(nested_embed_window->parent());
-    mouse = ui::MouseEvent(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(),
-                           base::TimeTicks(), 0, 0);
+    mouse = ui::MouseEvent(
+        ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), base::TimeTicks(), 0, 0,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     DispatchInputEventToWindow(nested_embed_window, mouse, nullptr);
     ASSERT_EQ(0u, nested_embed_client_proxy->tracker()->changes()->size());
     ASSERT_EQ(0u, embed_client_proxy->tracker()->changes()->size());
 
     ASSERT_EQ(1u, embedder_client->tracker()->changes()->size());
     EXPECT_EQ(CHANGE_TYPE_INPUT_EVENT,
               (*embedder_client->tracker()->changes())[0].type);
     WindowTreeTestApi(embedder_tree)
         .AckLastEvent(mojom::EventResult::UNHANDLED);
   }
@@ skipping 73 matching lines @@
       base::TimeTicks());
   window_manager_state()->ProcessEvent(move, 0);
   // The event isn't over a valid target, which should trigger resetting the
   // cursor to POINTER.
   EXPECT_EQ(ui::mojom::CursorType::POINTER, display_test_api.last_cursor());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui