Remove GestureScrollUpdateWithoutPropagation event

content/browser/renderer_host/input/input_router_impl_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 <math.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 974 matching lines @@
   EXPECT_FALSE(HasPendingEvents());
   SendInputEventACK(WebInputEvent::TouchCancel,
                     INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
   EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
   EXPECT_FALSE(HasPendingEvents());
 }
 
 TEST_F(InputRouterImplTest, GestureTypesIgnoringAck) {
   // We test every gesture type, ensuring that the stream of gestures is valid.
-  const int kEventTypesLength = 29;
+  const int kEventTypesLength = 28;
   WebInputEvent::Type eventTypes[kEventTypesLength] = {

[jdduke (slow), 2014/11/26 19:26:03]

Could we ditch the hard count and just use |eventTypes[] = {| together with
arraysize?

[majidvp, 2014/11/27 15:47:55]

Done.

       WebInputEvent::GestureTapDown,
       WebInputEvent::GestureShowPress,
       WebInputEvent::GestureTapCancel,
       WebInputEvent::GestureScrollBegin,
       WebInputEvent::GestureFlingStart,
       WebInputEvent::GestureFlingCancel,
       WebInputEvent::GestureTapDown,
       WebInputEvent::GestureTap,
       WebInputEvent::GestureTapDown,
       WebInputEvent::GestureLongPress,
       WebInputEvent::GestureTapCancel,
       WebInputEvent::GestureLongTap,
       WebInputEvent::GestureTapDown,
       WebInputEvent::GestureTapUnconfirmed,
       WebInputEvent::GestureTapCancel,
       WebInputEvent::GestureTapDown,
       WebInputEvent::GestureDoubleTap,
       WebInputEvent::GestureTapDown,
       WebInputEvent::GestureTapCancel,
       WebInputEvent::GestureTwoFingerTap,
       WebInputEvent::GestureTapDown,
       WebInputEvent::GestureTapCancel,
       WebInputEvent::GestureScrollBegin,
       WebInputEvent::GestureScrollUpdate,
-      WebInputEvent::GestureScrollUpdateWithoutPropagation,
       WebInputEvent::GesturePinchBegin,
       WebInputEvent::GesturePinchUpdate,
       WebInputEvent::GesturePinchEnd,
       WebInputEvent::GestureScrollEnd};
   for (int i = 0; i < kEventTypesLength; ++i) {
     WebInputEvent::Type type = eventTypes[i];
     if (!WebInputEventTraits::IgnoresAckDisposition(GetEventWithType(type))) {
       SimulateGestureEvent(type, blink::WebGestureDeviceTouchscreen);
       EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
       EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
@@ skipping 869 matching lines @@
   client_overscroll = client_->GetAndResetOverscroll();
   EXPECT_EQ(wheel_overscroll.accumulated_overscroll,
             client_overscroll.accumulated_overscroll);
   EXPECT_EQ(wheel_overscroll.latest_overscroll_delta,
             client_overscroll.latest_overscroll_delta);
   EXPECT_EQ(wheel_overscroll.current_fling_velocity,
             client_overscroll.current_fling_velocity);
 }
 
 }  // namespace content