Revert of Remove deprecated methods from Pickle.

content/browser/loader/resource_dispatcher_host_unittest.cc

 // Copyright (c) 2012 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 <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 76 matching lines @@
 //
 // See ResourceDispatcher::ReleaseResourcesInDataMessage.
 //
 // TODO(davidben): It would be nice if the behavior for base::SharedMemoryHandle
 // were more like it is in POSIX where the received fds are tracked in a
 // ref-counted core that closes them if not extracted.
 void ReleaseHandlesInMessage(const IPC::Message& message) {
   if (message.type() == ResourceMsg_SetDataBuffer::ID) {
     PickleIterator iter(message);
     int request_id;
-    CHECK(iter.ReadInt(&request_id));
+    CHECK(message.ReadInt(&iter, &request_id));
     base::SharedMemoryHandle shm_handle;
     if (IPC::ParamTraits<base::SharedMemoryHandle>::Read(&message,
                                                          &iter,
                                                          &shm_handle)) {
       if (base::SharedMemory::IsHandleValid(shm_handle))
         base::SharedMemory::CloseHandle(shm_handle);
     }
   }
 }
 
@@ skipping 2909 matching lines @@
   return nullptr;
 }
 
 net::URLRequestJob* TestURLRequestJobFactory::MaybeInterceptResponse(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate) const {
   return nullptr;
 }
 
 }  // namespace content