Revert of Remove deprecated methods from Pickle.

ipc/ipc_sync_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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 #include <stack>
@@ skipping 95 matching lines @@
   header.message_id = GetMessageId(*msg);
   WriteSyncHeader(reply, header);
 
   return reply;
 }
 
 bool SyncMessage::ReadSyncHeader(const Message& msg, SyncHeader* header) {
   DCHECK(msg.is_sync() || msg.is_reply());
 
   PickleIterator iter(msg);
-  bool result = iter.ReadInt(&header->message_id);
+  bool result = msg.ReadInt(&iter, &header->message_id);
   if (!result) {
     NOTREACHED();
     return false;
   }
 
   return true;
 }
 
 bool SyncMessage::WriteSyncHeader(Message* msg, const SyncHeader& header) {
   DCHECK(msg->is_sync() || msg->is_reply());
   DCHECK(msg->payload_size() == 0);
   bool result = msg->WriteInt(header.message_id);
   if (!result) {
     NOTREACHED();
     return false;
   }
 
   // Note: if you add anything here, you need to update kSyncMessageHeaderSize.
   DCHECK(kSyncMessageHeaderSize == msg->payload_size());
 
   return true;
 }
 
 
 bool MessageReplyDeserializer::SerializeOutputParameters(const Message& msg) {
   return SerializeOutputParameters(msg, SyncMessage::GetDataIterator(&msg));
 }
 
 }  // namespace IPC