Add support for passing an arbitrary parameter to an IPC message handler. The motivation is for Web…

content/renderer/render_widget_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 "content/renderer/render_widget.h"
 
 #include <vector>
 
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "content/common/input_messages.h"
@@ skipping 59 matching lines @@
  private:
   std::vector<gfx::Rect> rects_;
   IPC::TestSink sink_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchableRenderWidget);
 };
 
 TEST_F(RenderWidgetUnittest, TouchHitTestSinglePoint) {
   scoped_refptr<TouchableRenderWidget> widget = new TouchableRenderWidget();
 
-  blink::WebInputEvent::Type type;
-  InputEventAckState ack_state;
-  ui::LatencyInfo latency;
-
   SyntheticWebTouchEvent touch;
   touch.PressPoint(10, 10);
 
   widget->SendInputEvent(touch);
   ASSERT_EQ(1u, widget->sink()->message_count());
 
   // Since there's currently no touch-event handling region, the response should
   // be 'no consumer exists'.
   const IPC::Message* message = widget->sink()->GetMessageAt(0);
   EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type());
-  InputHostMsg_HandleInputEvent_ACK::Read(message, &type, &ack_state, &latency);
+  InputHostMsg_HandleInputEvent_ACK::Param params;
+  InputHostMsg_HandleInputEvent_ACK::Read(message, &params);
+  InputEventAckState ack_state = params.b;
   EXPECT_EQ(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, ack_state);
   widget->sink()->ClearMessages();
 
   std::vector<gfx::Rect> rects;
   rects.push_back(gfx::Rect(0, 0, 20, 20));
   rects.push_back(gfx::Rect(25, 0, 10, 10));
   widget->SetTouchRegion(rects);
 
   widget->SendInputEvent(touch);
   ASSERT_EQ(1u, widget->sink()->message_count());
   message = widget->sink()->GetMessageAt(0);
   EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type());
-  InputHostMsg_HandleInputEvent_ACK::Read(message, &type, &ack_state, &latency);
+  InputHostMsg_HandleInputEvent_ACK::Read(message, &params);
+  ack_state = params.b;
   EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, ack_state);
   widget->sink()->ClearMessages();
 }
 
 TEST_F(RenderWidgetUnittest, TouchHitTestMultiplePoints) {
   scoped_refptr<TouchableRenderWidget> widget = new TouchableRenderWidget();
   std::vector<gfx::Rect> rects;
   rects.push_back(gfx::Rect(0, 0, 20, 20));
   rects.push_back(gfx::Rect(25, 0, 10, 10));
   widget->SetTouchRegion(rects);
 
-  blink::WebInputEvent::Type type;
-  InputEventAckState ack_state;
-  ui::LatencyInfo latency;
-
   SyntheticWebTouchEvent touch;
   touch.PressPoint(25, 25);
 
   widget->SendInputEvent(touch);
   ASSERT_EQ(1u, widget->sink()->message_count());
 
   // Since there's currently no touch-event handling region, the response should
   // be 'no consumer exists'.
   const IPC::Message* message = widget->sink()->GetMessageAt(0);
   EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type());
-  InputHostMsg_HandleInputEvent_ACK::Read(message, &type, &ack_state, &latency);
+  InputHostMsg_HandleInputEvent_ACK::Param params;
+  InputHostMsg_HandleInputEvent_ACK::Read(message, &params);
+  InputEventAckState ack_state = params.b;
   EXPECT_EQ(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, ack_state);
   widget->sink()->ClearMessages();
 
   // Press a second touch point. This time, on a touch-handling region.
   touch.PressPoint(10, 10);
   widget->SendInputEvent(touch);
   ASSERT_EQ(1u, widget->sink()->message_count());
   message = widget->sink()->GetMessageAt(0);
   EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type());
-  InputHostMsg_HandleInputEvent_ACK::Read(message, &type, &ack_state, &latency);
+  InputHostMsg_HandleInputEvent_ACK::Read(message, &params);
+  ack_state = params.b;
   EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, ack_state);
   widget->sink()->ClearMessages();
 }
 
 }  // namespace content