Add pointer id to the WebMouseEvent's constructors

services/ui/ws/drag_controller_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/drag_controller.h"
 
 #include <map>
 #include <memory>
 #include <queue>
 #include <utility>
@@ skipping 138 matching lines @@
     connection_by_window_[p->window()] = p.get();
     return p;
   }
 
   void StartDragOperation(
       DragTestWindow* window,
       uint32_t drag_operations) {
     window->PerformOnDragDropStart(
         std::unordered_map<std::string, std::vector<uint8_t>>());
     drag_operation_ = base::MakeUnique<DragController>(
-        this, this, window->window(), window, MouseEvent::kMousePointerId,
+        this, this, window->window(), window,
+        MouseEvent::kDefaultMousePointerId,
         std::unordered_map<std::string, std::vector<uint8_t>>(),
         drag_operations);
 
     // It would be nice if we could just let the observer method fire, but it
     // fires during the constructor when we haven't assigned the unique_ptr
     // yet.
     cursor_ = drag_operation_->current_cursor().cursor_type();
   }
 
   void DispatchDrag(DragTestWindow* window,
@@ skipping 451 matching lines @@
   EXPECT_EQ(QueuedType::ENTER, window->queue_response_type());
   window->Respond(true);
 
   drag_operation()->Cancel();
 
   EXPECT_FALSE(drag_completed_value().value_or(true));
 }
 
 TEST_F(DragControllerTest, IgnoreEventsFromOtherPointers) {
   std::unique_ptr<DragTestWindow> window = BuildWindow();
-  // This starts the operation with MouseEvent::kMousePointerId.
+  // This starts the operation with MouseEvent::kDefaultMousePointerId.
   StartDragOperation(window.get(), ui::mojom::kDropEffectMove);
 
   // Ignore events from pointer 5.
   DispatchDragWithPointer(window.get(), 5, false, ui::EF_LEFT_MOUSE_BUTTON,
                           gfx::Point(1, 1));
   ASSERT_EQ(0u, window->queue_size());
 }
 
 TEST_F(DragControllerTest, RejectingWindowHasProperCursor) {
   std::unique_ptr<DragTestWindow> window = BuildWindow();
@@ skipping 39 matching lines @@
 
   // Window 2 responding negatively to its queued messages shouldn't change the
   // cursor.
   window2->Respond(false);
 
   EXPECT_EQ(ui::CursorType::kCopy, cursor_type());
 }
 
 }  // namespace ws
 }  // namespace ui