Sync ui/events to chromium @ https://codereview.chromium.org/1210203002

ui/events/gesture_detection/motion_event_buffer_unittest.cc

 // Copyright 2014 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 "base/basictypes.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/gesture_detection/motion_event_buffer.h"
-#include "ui/events/test/mock_motion_event.h"
+#include "ui/events/test/motion_event_test_utils.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 using ui::test::MockMotionEvent;
 
 namespace ui {
 
 const int kSmallDeltaMs = 1;
 const int kLargeDeltaMs = 50;
 const int kResampleDeltaMs = 5;
@@ skipping 53 matching lines @@
     return base::TimeDelta::FromMilliseconds(kSmallDeltaMs);
   }
 
   static base::TimeDelta ResampleDelta() {
     return base::TimeDelta::FromMilliseconds(kResampleDeltaMs);
   }
 
   static void ExpectEqualsImpl(const MotionEvent& a,
                                const MotionEvent& b,
                                bool ignore_history) {
-    EXPECT_EQ(a.GetId(), b.GetId());
     EXPECT_EQ(a.GetAction(), b.GetAction());
-    EXPECT_EQ(a.GetActionIndex(), b.GetActionIndex());
+    if (a.GetAction() == MotionEvent::ACTION_POINTER_DOWN ||
+        a.GetAction() == MotionEvent::ACTION_POINTER_UP) {
+      EXPECT_EQ(a.GetActionIndex(), b.GetActionIndex());
+    }
     EXPECT_EQ(a.GetButtonState(), b.GetButtonState());
     EXPECT_EQ(a.GetEventTime(), b.GetEventTime());
 
     ASSERT_EQ(a.GetPointerCount(), b.GetPointerCount());
     for (size_t i = 0; i < a.GetPointerCount(); ++i) {
       int bi = b.FindPointerIndexOfId(a.GetPointerId(i));
       ASSERT_NE(bi, -1);
       EXPECT_EQ(a.GetX(i), b.GetX(bi));
       EXPECT_EQ(a.GetY(i), b.GetY(bi));
       EXPECT_EQ(a.GetRawX(i), b.GetRawX(bi));
@@ skipping 240 matching lines @@
   // The flushed event should only include the latest move event.
   buffer.Flush(event_time);
   ScopedVector<MotionEvent> events = GetAndResetForwardedEvents();
   ASSERT_EQ(3U, events.size());
   EXPECT_EVENT_EQ(move2, *events.back());
   EXPECT_FALSE(GetAndResetNeedsFlush());
 
   event_time += base::TimeDelta::FromMilliseconds(5);
 
   // Events with different pointer ids should not combine.
-  PointerProperties pointer0(5.f, 5.f);
+  PointerProperties pointer0(5.f, 5.f, 1.f);
   pointer0.id = 1;
-  PointerProperties pointer1(10.f, 10.f);
+  PointerProperties pointer1(10.f, 10.f, 2.f);
   pointer1.id = 2;
   MotionEventGeneric move3(MotionEvent::ACTION_MOVE, event_time, pointer0);
   move3.PushPointer(pointer1);
   buffer.OnMotionEvent(move3);
   ASSERT_FALSE(GetLastEvent());
   EXPECT_TRUE(GetAndResetNeedsFlush());
 
   MotionEventGeneric move4(MotionEvent::ACTION_MOVE, event_time, pointer0);
   pointer1.id = 7;
   move4.PushPointer(pointer1);
@@ skipping 40 matching lines @@
   buffer.Flush(flush_time);
   EXPECT_FALSE(GetAndResetNeedsFlush());
   ASSERT_TRUE(GetLastEvent());
   EXPECT_EVENT_EQ(move, *GetLastEvent());
 }
 
 TEST_F(MotionEventBufferTest, OutOfOrderPointersBuffered) {
   base::TimeTicks event_time = base::TimeTicks::Now();
   MotionEventBuffer buffer(this, true);
 
-  PointerProperties p0(1.f, 2.f);
+  PointerProperties p0(1.f, 2.f, 3.f);
   p0.id = 1;
-  PointerProperties p1(2.f, 1.f);
+  PointerProperties p1(2.f, 1.f, 0.5f);
   p1.id = 2;
 
   MotionEventGeneric move0(MotionEvent::ACTION_MOVE, event_time, p0);
   move0.PushPointer(p1);
   buffer.OnMotionEvent(move0);
   EXPECT_TRUE(GetAndResetNeedsFlush());
   ASSERT_FALSE(GetLastEvent());
 
   event_time += base::TimeDelta::FromMilliseconds(5);
 
@@ skipping 439 matching lines @@
 TEST_F(MotionEventBufferTest, Resampling150to60) {
   base::TimeDelta flush_time_delta =
       base::TimeDelta::FromMillisecondsD(1000. / 60.);
   base::TimeDelta event_time_delta =
       base::TimeDelta::FromMillisecondsD(1000. / 150.);
 
   RunResample(flush_time_delta, event_time_delta);
 }
 
 }  // namespace ui