Bundle DidOverscrollParams with the InputEventAck

content/browser/renderer_host/input/mock_input_router_client.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/browser/renderer_host/input/mock_input_router_client.h"
 
 #include "content/browser/renderer_host/input/input_router.h"
 #include "content/common/input/input_event.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 32 matching lines @@
 
 void MockInputRouterClient::DecrementInFlightEventCount() {
   --in_flight_event_count_;
 }
 
 void MockInputRouterClient::OnHasTouchEventHandlers(
     bool has_handlers)  {
   has_touch_handler_ = has_handlers;
 }
 
+OverscrollController* MockInputRouterClient::GetOverscrollController() const {
+  return NULL;
+}
+
+void MockInputRouterClient::DidFlush() {
+  ++did_flush_called_count_;
+}
+
+void MockInputRouterClient::DidOverscroll(const DidOverscrollParams& params) {
+  overscroll_ = params;
+}
+
+void MockInputRouterClient::SetNeedsFlush() {
+  set_needs_flush_called_ = true;
+}
+
 bool MockInputRouterClient::GetAndResetFilterEventCalled() {
   bool filter_input_event_called = filter_input_event_called_;
   filter_input_event_called_ = false;
   return filter_input_event_called;
 }
 
 size_t MockInputRouterClient::GetAndResetDidFlushCount() {
   size_t did_flush_called_count = did_flush_called_count_;
   did_flush_called_count_ = 0;
   return did_flush_called_count;
 }
 
-OverscrollController* MockInputRouterClient::GetOverscrollController() const {
-  return NULL;
-}
-
-void MockInputRouterClient::DidFlush() {
-  ++did_flush_called_count_;
-}
-
-void MockInputRouterClient::SetNeedsFlush() {
-  set_needs_flush_called_ = true;
+DidOverscrollParams MockInputRouterClient::GetAndResetOverscroll() {
+  DidOverscrollParams overscroll;
+  std::swap(overscroll_, overscroll);
+  return overscroll;
 }
 
 }  // namespace content