Make SyntheticPointerAction to flush the pointer action sequence

content/common/input/input_param_traits_unittest.cc

Index: content/common/input/input_param_traits_unittest.cc
diff --git a/content/common/input/input_param_traits_unittest.cc b/content/common/input/input_param_traits_unittest.cc
index 01acafc2772ea9a5611d24b7ed336028639f04bc..b3938b7e1607a75760adecff293e7ba3f65a38d2 100644
--- a/content/common/input/input_param_traits_unittest.cc
+++ b/content/common/input/input_param_traits_unittest.cc
@@ -11,6 +11,7 @@
 #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_list_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"
@@ -81,7 +82,6 @@ class InputParamTraitsTest : public testing::Test {
 
   static void Compare(const SyntheticPointerActionParams* a,
                       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 ||
@@ -97,6 +97,15 @@ class InputParamTraitsTest : public testing::Test {
     }
   }
 
+  static void Compare(const SyntheticPointerActionListParams* a,
+                      const SyntheticPointerActionListParams* b) {
+    EXPECT_EQ(a->gesture_source_type, b->gesture_source_type);
+    EXPECT_EQ(a->param_list.size(), b->param_list.size());
+    for (size_t i = 0; i < a->param_list.size(); ++i) {
+      Compare(&a->param_list[i], &b->param_list[i]);
+    }
+  }
+
   static void Compare(const SyntheticGesturePacket* a,
                       const SyntheticGesturePacket* b) {
     ASSERT_EQ(!!a, !!b);
@@ -122,9 +131,9 @@ class InputParamTraitsTest : public testing::Test {
         Compare(SyntheticTapGestureParams::Cast(a->gesture_params()),
                 SyntheticTapGestureParams::Cast(b->gesture_params()));
         break;
-      case SyntheticGestureParams::POINTER_ACTION:
-        Compare(SyntheticPointerActionParams::Cast(a->gesture_params()),
-                SyntheticPointerActionParams::Cast(b->gesture_params()));
+      case SyntheticGestureParams::POINTER_ACTION_LIST:
+        Compare(SyntheticPointerActionListParams::Cast(a->gesture_params()),
+                SyntheticPointerActionListParams::Cast(b->gesture_params()));
         break;
     }
   }
@@ -274,54 +283,21 @@ TEST_F(InputParamTraitsTest, SyntheticTapGestureParams) {
   Verify(packet_in);
 }
 
-TEST_F(InputParamTraitsTest, SyntheticPointerActionParamsMove) {
-  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 =
-      base::MakeUnique<SyntheticPointerActionParams>(
-          SyntheticPointerActionParams::PointerActionType::RELEASE);

[tdresser, 2016/10/26 18:28:40]

Should we still have release specific coverage, or are release and move similar
enough that it isn't warranted?

[lanwei, 2016/10/30 23:23:13]

Thanks for catching this, I delete by accident.

+TEST_F(InputParamTraitsTest, SyntheticPointerActionListParams) {
+  SyntheticPointerActionParams action_params(
+      SyntheticGestureParams::TOUCH_INPUT,
+      SyntheticPointerActionParams::PointerActionType::MOVE);
+  action_params.set_position(gfx::PointF(356, 287));
+  action_params.set_index(0);
+  std::unique_ptr<SyntheticPointerActionListParams> gesture_params =
+      base::MakeUnique<SyntheticPointerActionListParams>(action_params);
   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 =
-      base::MakeUnique<SyntheticPointerActionParams>(
-          SyntheticPointerActionParams::PointerActionType::PROCESS);
-  gesture_params->gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
-  ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION,
+  ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION_LIST,
             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);
 }