Prepare SyntheticPointerAction to handle touch actions for multiple fingers

content/common/input/input_param_traits_unittest.cc

 // Copyright 2013 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 "content/common/input/input_param_traits.h"
 
 #include <stddef.h>
 #include <utility>
 
+#include "base/memory/ptr_util.h"
 #include "content/common/input/input_event.h"
 #include "content/common/input/synthetic_gesture_params.h"
 #include "content/common/input/synthetic_pinch_gesture_params.h"
 #include "content/common/input/synthetic_pointer_action_params.h"
 #include "content/common/input/synthetic_smooth_drag_gesture_params.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/common/input_messages.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
@@ skipping 62 matching lines @@
                       const SyntheticPointerActionParams* b) {
     EXPECT_EQ(a->gesture_source_type, b->gesture_source_type);
     EXPECT_EQ(a->pointer_action_type(), b->pointer_action_type());
     if (a->pointer_action_type() ==
             SyntheticPointerActionParams::PointerActionType::PRESS ||
         a->pointer_action_type() ==
             SyntheticPointerActionParams::PointerActionType::MOVE) {
       EXPECT_EQ(a->position(), b->position());
     }
     if (a->pointer_action_type() !=
-        SyntheticPointerActionParams::PointerActionType::PROCESS) {
+            SyntheticPointerActionParams::PointerActionType::PROCESS &&
+        a->pointer_action_type() !=
+            SyntheticPointerActionParams::PointerActionType::FINISH) {
       EXPECT_EQ(a->index(), b->index());
     }
   }
 
   static void Compare(const SyntheticGesturePacket* a,
                       const SyntheticGesturePacket* b) {
     ASSERT_EQ(!!a, !!b);
     if (!a) return;
     ASSERT_EQ(!!a->gesture_params(), !!b->gesture_params());
     if (!a->gesture_params()) return;
@@ skipping 162 matching lines @@
   gesture_params->duration_ms = 13;
   ASSERT_EQ(SyntheticGestureParams::TAP_GESTURE,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(std::move(gesture_params));
 
   Verify(packet_in);
 }
 
 TEST_F(InputParamTraitsTest, SyntheticPointerActionParamsMove) {
-  std::unique_ptr<SyntheticPointerActionParams> gesture_params(
-      new SyntheticPointerActionParams(
-          SyntheticPointerActionParams::PointerActionType::MOVE));
+  std::unique_ptr<SyntheticPointerActionParams> gesture_params =
+      base::MakeUnique<SyntheticPointerActionParams>(
+          SyntheticPointerActionParams::PointerActionType::MOVE);
   gesture_params->gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
   gesture_params->set_position(gfx::PointF(356, 287));
   gesture_params->set_index(0);
   ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(std::move(gesture_params));
   Verify(packet_in);
 }
 
 TEST_F(InputParamTraitsTest, SyntheticPointerActionParamsRelease) {
-  std::unique_ptr<SyntheticPointerActionParams> gesture_params(
-      new SyntheticPointerActionParams(
-          SyntheticPointerActionParams::PointerActionType::RELEASE));
+  std::unique_ptr<SyntheticPointerActionParams> gesture_params =
+      base::MakeUnique<SyntheticPointerActionParams>(
+          SyntheticPointerActionParams::PointerActionType::RELEASE);
   gesture_params->gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
   gesture_params->set_index(0);
   ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(std::move(gesture_params));
   Verify(packet_in);
 }
 
 TEST_F(InputParamTraitsTest, SyntheticPointerActionParamsProcess) {
-  std::unique_ptr<SyntheticPointerActionParams> gesture_params(
-      new SyntheticPointerActionParams(
-          SyntheticPointerActionParams::PointerActionType::PROCESS));
+  std::unique_ptr<SyntheticPointerActionParams> gesture_params =
+      base::MakeUnique<SyntheticPointerActionParams>(
+          SyntheticPointerActionParams::PointerActionType::PROCESS);
   gesture_params->gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
   ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION,
             gesture_params->GetGestureType());
+  SyntheticGesturePacket packet_in;
+  packet_in.set_gesture_params(std::move(gesture_params));
+  Verify(packet_in);
+}
+
+TEST_F(InputParamTraitsTest, SyntheticPointerActionParamsFinish) {
+  std::unique_ptr<SyntheticPointerActionParams> gesture_params =
+      base::MakeUnique<SyntheticPointerActionParams>(
+          SyntheticPointerActionParams::PointerActionType::FINISH);
+  gesture_params->gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
+  ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION,
+            gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(std::move(gesture_params));
   Verify(packet_in);
 }
 
 }  // namespace
 }  // namespace content