Revert of Remove deprecated methods from Pickle.

content/browser/renderer_host/input/input_router_impl_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 <math.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 31 matching lines @@
 using blink::WebTouchPoint;
 
 namespace content {
 
 namespace {
 
 const WebInputEvent* GetInputEventFromMessage(const IPC::Message& message) {
   PickleIterator iter(message);
   const char* data;
   int data_length;
-  if (!iter.ReadData(&data, &data_length))
+  if (!message.ReadData(&iter, &data, &data_length))
     return NULL;
   return reinterpret_cast<const WebInputEvent*>(data);
 }
 
 WebInputEvent& GetEventWithType(WebInputEvent::Type type) {
   WebInputEvent* event = NULL;
   if (WebInputEvent::isMouseEventType(type)) {
     static WebMouseEvent mouse;
     event = &mouse;
   } else if (WebInputEvent::isTouchEventType(type)) {
@@ skipping 1836 matching lines @@
   client_overscroll = client_->GetAndResetOverscroll();
   EXPECT_EQ(wheel_overscroll.accumulated_overscroll,
             client_overscroll.accumulated_overscroll);
   EXPECT_EQ(wheel_overscroll.latest_overscroll_delta,
             client_overscroll.latest_overscroll_delta);
   EXPECT_EQ(wheel_overscroll.current_fling_velocity,
             client_overscroll.current_fling_velocity);
 }
 
 }  // namespace content