input: Make the OverscrollController less intrusive, and some code cleanup.

content/browser/renderer_host/input/buffered_input_router_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 "base/basictypes.h"
 #include "content/browser/renderer_host/input/buffered_input_router.h"
 #include "content/browser/renderer_host/input/input_router_unittest.h"
 #include "content/common/input/event_packet.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
@@ skipping 249 matching lines @@
   SimulateKeyboardEvent(WebInputEvent::RawKeyDown);
   EXPECT_EQ(1U, QueuedEventCount());
   SCOPED_EXPECT(client_->ExpectNeedsFlushCalled(true), "SetNeedsFlushCalled");
 
   // Subsequently queued events will not trigger another flush request.
   SimulateWheelEvent(5, 0, 0, false);
   EXPECT_EQ(2U, QueuedEventCount());
   SCOPED_EXPECT(client_->ExpectNeedsFlushCalled(false), "SetNeedsFlushCalled");
 }
 
-TEST_F(BufferedInputRouterTest, HasQueuedGestureEvents) {
-  EXPECT_FALSE(input_router_->HasQueuedGestureEvents());
-  SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
-                       WebGestureEvent::Touchpad);
-  EXPECT_TRUE(input_router_->HasQueuedGestureEvents());
-
-  // Only an ack'ed gesture should clear it from the queue.
-  input_router_->Flush();
-  ASSERT_TRUE(FinishFlush(INPUT_EVENT_COULD_NOT_DELIVER));
-  EXPECT_TRUE(input_router_->HasQueuedGestureEvents());
-
-  ASSERT_TRUE(FinishFlush(INPUT_EVENT_IMPL_THREAD_CONSUMED));
-  EXPECT_FALSE(input_router_->HasQueuedGestureEvents());
-}
-
 TEST_F(BufferedInputRouterTest, GetLastKeyboardEvent) {
   EXPECT_EQ(NULL, input_router_->GetLastKeyboardEvent());
 
   SimulateKeyboardEvent(WebInputEvent::RawKeyDown);
   EXPECT_EQ(WebInputEvent::RawKeyDown,
             input_router_->GetLastKeyboardEvent()->type);
 
   // Queueing another key event does not effect the "last" event.
   SimulateKeyboardEvent(WebInputEvent::KeyUp);
   EXPECT_EQ(WebInputEvent::RawKeyDown,
@@ skipping 31 matching lines @@
   input_router_->Flush();
 
   ASSERT_FALSE(ack_handler_->unexpected_event_ack_called());
   EventPacket packet;
   input_router_->OnMessageReceived(
       InputHostMsg_HandleEventPacket_ACK(0, 0, InputEventDispositions()));
   EXPECT_TRUE(ack_handler_->unexpected_event_ack_called());
 }
 
 }  // namespace content