Revert of Remove deprecated methods from Pickle.

ipc/ipc_message.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_message.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 
@@ skipping 121 matching lines @@
 
 bool Message::WriteBorrowingFile(const base::PlatformFile& descriptor) {
   // We write the index of the descriptor so that we don't have to
   // keep the current descriptor as extra decoding state when deserialising.
   WriteInt(file_descriptor_set()->size());
   return file_descriptor_set()->AddToBorrow(descriptor);
 }
 
 bool Message::ReadFile(PickleIterator* iter, base::ScopedFD* descriptor) const {
   int descriptor_index;
-  if (!iter->ReadInt(&descriptor_index))
+  if (!ReadInt(iter, &descriptor_index))
     return false;
 
   FileDescriptorSet* file_descriptor_set = file_descriptor_set_.get();
   if (!file_descriptor_set)
     return false;
 
   base::PlatformFile file =
       file_descriptor_set->TakeDescriptorAt(descriptor_index);
   if (file < 0)
     return false;
 
   descriptor->reset(file);
   return true;
 }
 
 bool Message::HasFileDescriptors() const {
   return file_descriptor_set_.get() && !file_descriptor_set_->empty();
 }
 
 void Message::EnsureFileDescriptorSet() {
   if (file_descriptor_set_.get() == NULL)
     file_descriptor_set_ = new FileDescriptorSet;
 }
 
 #endif
 
 }  // namespace IPC