Synthesize ctrl-wheel events on touchpad pinch

content/browser/renderer_host/input/mock_input_ack_handler.h

Index: content/browser/renderer_host/input/mock_input_ack_handler.h
diff --git a/content/browser/renderer_host/input/mock_input_ack_handler.h b/content/browser/renderer_host/input/mock_input_ack_handler.h
index 88ca9e186fcbedfd6f6a7fcac6a58155b090eb6e..875964a808014aac7143b08105cbbf155999d784 100644
--- a/content/browser/renderer_host/input/mock_input_ack_handler.h
+++ b/content/browser/renderer_host/input/mock_input_ack_handler.h
@@ -47,6 +47,8 @@ class MockInputAckHandler : public InputAckHandler {
   }
   InputEventAckState ack_state() const { return ack_state_; }
 
+  blink::WebInputEvent::Type ack_event_type() const { return ack_event_type_; }
+
   const NativeWebKeyboardEvent& acked_keyboard_event() const {
     return acked_key_event_;
   }
@@ -61,12 +63,14 @@ class MockInputAckHandler : public InputAckHandler {
   }
 
  private:
-  void RecordAckCalled(InputEventAckState ack_result);
+  void RecordAckCalled(blink::WebInputEvent::Type eventType,
+                       InputEventAckState ack_result);
 
   InputRouter* input_router_;
 
   size_t ack_count_;
   bool unexpected_event_ack_called_;
+  blink::WebInputEvent::Type ack_event_type_;

[jdduke (slow), 2014/05/01 15:44:47]

Initialize in the constructor to |WebInputEvent::Undefined|.

[Rick Byers, 2014/05/01 17:34:57]

Done.

   InputEventAckState ack_state_;
   NativeWebKeyboardEvent acked_key_event_;
   blink::WebMouseWheelEvent acked_wheel_event_;