Bundle DidOverscrollParams with the InputEventAck

content/browser/renderer_host/input/mock_input_router_client.cc

Index: content/browser/renderer_host/input/mock_input_router_client.cc
diff --git a/content/browser/renderer_host/input/mock_input_router_client.cc b/content/browser/renderer_host/input/mock_input_router_client.cc
index 9b5317d81eb37d7295a976f29783bf2e232b6001..cb576efdfd72cc8b910a2c27a91427fddc2ba852 100644
--- a/content/browser/renderer_host/input/mock_input_router_client.cc
+++ b/content/browser/renderer_host/input/mock_input_router_client.cc
@@ -50,6 +50,22 @@ void MockInputRouterClient::OnHasTouchEventHandlers(
   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;
@@ -62,16 +78,10 @@ size_t MockInputRouterClient::GetAndResetDidFlushCount() {
   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