Revert of Remove deprecated methods from Pickle.

content/child/threaded_data_provider.cc

 // Copyright 2014 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/child/threaded_data_provider.h"
 
 #include "content/child/child_process.h"
 #include "content/child/child_thread.h"
 #include "content/child/resource_dispatcher.h"
 #include "content/child/thread_safe_sender.h"
@@ skipping 69 matching lines @@
 bool DataProviderMessageFilter::OnMessageReceived(
     const IPC::Message& message) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
 
   if (message.type() != ResourceMsg_DataReceived::ID)
     return false;
 
   int request_id;
 
   PickleIterator iter(message);
-  if (!iter.ReadInt(&request_id)) {
+  if (!message.ReadInt(&iter, &request_id)) {
     NOTREACHED() << "malformed resource message";
     return true;
   }
 
   if (request_id == request_id_) {
     ResourceMsg_DataReceived::Schema::Param arg;
     if (ResourceMsg_DataReceived::Read(&message, &arg)) {
       OnReceivedData(get<0>(arg), get<1>(arg), get<2>(arg), get<3>(arg));
       return true;
     }
@@ skipping 177 matching lines @@
 
   // TODO(oysteine): SiteIsolationPolicy needs to be be checked
   // here before we pass the data to the data provider
   // (or earlier on the I/O thread), otherwise once SiteIsolationPolicy does
   // actual blocking as opposed to just UMA logging this will bypass it.
   threaded_data_receiver_->acceptData(data, data_length);
   ipc_channel_->Send(new ResourceHostMsg_DataReceived_ACK(request_id_));
 }
 
 }  // namespace content