Revert of Remove deprecated methods from Pickle.

ipc/ipc_channel_posix.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 "ipc/ipc_channel_posix.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/socket.h>
@@ skipping 987 matching lines @@
   // The Hello message contains only the process id.
   PickleIterator iter(msg);
 
   switch (msg.type()) {
     default:
       NOTREACHED();
       break;
 
     case Channel::HELLO_MESSAGE_TYPE:
       int pid;
-      if (!iter.ReadInt(&pid))
+      if (!msg.ReadInt(&iter, &pid))
         NOTREACHED();
 
 #if defined(IPC_USES_READWRITE)
       if (mode_ & MODE_SERVER_FLAG) {
         // With IPC_USES_READWRITE, the Hello message from the client to the
         // server also contains the fd_pipe_, which  will be used for all
         // subsequent file descriptor passing.
         DCHECK_EQ(msg.file_descriptor_set()->size(), 1U);
         base::ScopedFD descriptor;
         if (!msg.ReadFile(&iter, &descriptor)) {
           NOTREACHED();
         }
         fd_pipe_.reset(descriptor.release());
       }
 #endif  // IPC_USES_READWRITE
       peer_pid_ = pid;
       listener()->OnChannelConnected(pid);
       break;
 
 #if defined(OS_MACOSX)
     case Channel::CLOSE_FD_MESSAGE_TYPE:
       int fd, hops;
-      if (!iter.ReadInt(&hops))
+      if (!msg.ReadInt(&iter, &hops))
         NOTREACHED();
-      if (!iter.ReadInt(&fd))
+      if (!msg.ReadInt(&iter, &fd))
         NOTREACHED();
       if (hops == 0) {
         if (fds_to_close_.erase(fd) > 0) {
           if (IGNORE_EINTR(close(fd)) < 0)
             PLOG(ERROR) << "close";
         } else {
           NOTREACHED();
         }
       } else {
         QueueCloseFDMessage(fd, hops);
@@ skipping 64 matching lines @@
 }
 
 #if defined(OS_LINUX)
 // static
 void Channel::SetGlobalPid(int pid) {
   ChannelPosix::SetGlobalPid(pid);
 }
 #endif  // OS_LINUX
 
 }  // namespace IPC