Revert of Remove deprecated methods from Pickle.

ipc/ipc_message_utils.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_utils.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/nullable_string16.h"
@@ skipping 190 matching lines @@
     case base::Value::TYPE_STRING: {
       std::string val;
       if (!ReadParam(m, iter, &val))
         return false;
       *value = new base::StringValue(val);
       break;
     }
     case base::Value::TYPE_BINARY: {
       const char* data;
       int length;
-      if (!iter->ReadData(&data, &length))
+      if (!m->ReadData(iter, &data, &length))
         return false;
       *value = base::BinaryValue::CreateWithCopiedBuffer(data, length);
       break;
     }
     case base::Value::TYPE_DICTIONARY: {
       scoped_ptr<base::DictionaryValue> val(new base::DictionaryValue());
       if (!ReadDictionaryValue(m, iter, val.get(), recursion))
         return false;
       *value = val.release();
       break;
@@ skipping 31 matching lines @@
   l->append(p ? "true" : "false");
 }
 
 void ParamTraits<unsigned char>::Write(Message* m, const param_type& p) {
   m->WriteBytes(&p, sizeof(param_type));
 }
 
 bool ParamTraits<unsigned char>::Read(const Message* m, PickleIterator* iter,
                                        param_type* r) {
   const char* data;
-  if (!iter->ReadBytes(&data, sizeof(param_type)))
+  if (!m->ReadBytes(iter, &data, sizeof(param_type)))
     return false;
   memcpy(r, data, sizeof(param_type));
   return true;
 }
 
 void ParamTraits<unsigned char>::Log(const param_type& p, std::string* l) {
   l->append(base::UintToString(p));
 }
 
 void ParamTraits<unsigned short>::Write(Message* m, const param_type& p) {
   m->WriteBytes(&p, sizeof(param_type));
 }
 
 bool ParamTraits<unsigned short>::Read(const Message* m, PickleIterator* iter,
                                        param_type* r) {
   const char* data;
-  if (!iter->ReadBytes(&data, sizeof(param_type)))
+  if (!m->ReadBytes(iter, &data, sizeof(param_type)))
     return false;
   memcpy(r, data, sizeof(param_type));
   return true;
 }
 
 void ParamTraits<unsigned short>::Log(const param_type& p, std::string* l) {
   l->append(base::UintToString(p));
 }
 
 void ParamTraits<int>::Log(const param_type& p, std::string* l) {
@@ skipping 24 matching lines @@
   l->append(base::StringPrintf("%e", p));
 }
 
 void ParamTraits<double>::Write(Message* m, const param_type& p) {
   m->WriteBytes(reinterpret_cast<const char*>(&p), sizeof(param_type));
 }
 
 bool ParamTraits<double>::Read(const Message* m, PickleIterator* iter,
                                param_type* r) {
   const char *data;
-  if (!iter->ReadBytes(&data, sizeof(*r))) {
+  if (!m->ReadBytes(iter, &data, sizeof(*r))) {
     NOTREACHED();
     return false;
   }
   memcpy(r, data, sizeof(param_type));
   return true;
 }
 
 void ParamTraits<double>::Log(const param_type& p, std::string* l) {
   l->append(base::StringPrintf("%e", p));
 }
@@ skipping 19 matching lines @@
   } else {
     m->WriteData(&p.front(), static_cast<int>(p.size()));
   }
 }
 
 bool ParamTraits<std::vector<char> >::Read(const Message* m,
                                            PickleIterator* iter,
                                            param_type* r) {
   const char *data;
   int data_size = 0;
-  if (!iter->ReadData(&data, &data_size) || data_size < 0)
+  if (!m->ReadData(iter, &data, &data_size) || data_size < 0)
     return false;
   r->resize(data_size);
   if (data_size)
     memcpy(&r->front(), data, data_size);
   return true;
 }
 
 void ParamTraits<std::vector<char> >::Log(const param_type& p, std::string* l) {
   LogBytes(p, l);
 }
 
 void ParamTraits<std::vector<unsigned char> >::Write(Message* m,
                                                      const param_type& p) {
   if (p.empty()) {
     m->WriteData(NULL, 0);
   } else {
     m->WriteData(reinterpret_cast<const char*>(&p.front()),
                  static_cast<int>(p.size()));
   }
 }
 
 bool ParamTraits<std::vector<unsigned char> >::Read(const Message* m,
                                                     PickleIterator* iter,
                                                     param_type* r) {
   const char *data;
   int data_size = 0;
-  if (!iter->ReadData(&data, &data_size) || data_size < 0)
+  if (!m->ReadData(iter, &data, &data_size) || data_size < 0)
     return false;
   r->resize(data_size);
   if (data_size)
     memcpy(&r->front(), data, data_size);
   return true;
 }
 
 void ParamTraits<std::vector<unsigned char> >::Log(const param_type& p,
                                                    std::string* l) {
   LogBytes(p, l);
 }
 
 void ParamTraits<std::vector<bool> >::Write(Message* m, const param_type& p) {
   WriteParam(m, static_cast<int>(p.size()));
   // Cast to bool below is required because libc++'s
   // vector<bool>::const_reference is different from bool, and we want to avoid
   // writing an extra specialization of ParamTraits for it.
   for (size_t i = 0; i < p.size(); i++)
     WriteParam(m, static_cast<bool>(p[i]));
 }
 
 bool ParamTraits<std::vector<bool> >::Read(const Message* m,
                                            PickleIterator* iter,
                                            param_type* r) {
   int size;
   // ReadLength() checks for < 0 itself.
-  if (!iter->ReadLength(&size))
+  if (!m->ReadLength(iter, &size))
     return false;
   r->resize(size);
   for (int i = 0; i < size; i++) {
     bool value;
     if (!ReadParam(m, iter, &value))
       return false;
     (*r)[i] = value;
   }
   return true;
 }
@@ skipping 312 matching lines @@
   // leave that up to the code sending the message to ensure.
   m->WriteUInt32(static_cast<uint32>(p.routing_id()));
   m->WriteUInt32(p.type());
   m->WriteUInt32(p.flags());
   m->WriteData(p.payload(), static_cast<uint32>(p.payload_size()));
 }
 
 bool ParamTraits<Message>::Read(const Message* m, PickleIterator* iter,
                                 Message* r) {
   uint32 routing_id, type, flags;
-  if (!iter->ReadUInt32(&routing_id) ||
-      !iter->ReadUInt32(&type) ||
-      !iter->ReadUInt32(&flags))
+  if (!m->ReadUInt32(iter, &routing_id) ||
+      !m->ReadUInt32(iter, &type) ||
+      !m->ReadUInt32(iter, &flags))
     return false;
 
   int payload_size;
   const char* payload;
-  if (!iter->ReadData(&payload, &payload_size))
+  if (!m->ReadData(iter, &payload, &payload_size))
     return false;
 
   r->SetHeaderValues(static_cast<int32>(routing_id), type, flags);
   return r->WriteBytes(payload, payload_size);
 }
 
 void ParamTraits<Message>::Log(const Message& p, std::string* l) {
   l->append("<IPC::Message>");
 }
 
 #if defined(OS_WIN)
 // Note that HWNDs/HANDLE/HCURSOR/HACCEL etc are always 32 bits, even on 64
 // bit systems. That's why we use the Windows macros to convert to 32 bits.
 void ParamTraits<HANDLE>::Write(Message* m, const param_type& p) {
   m->WriteInt(HandleToLong(p));
 }
 
 bool ParamTraits<HANDLE>::Read(const Message* m, PickleIterator* iter,
                                param_type* r) {
   int32 temp;
-  if (!iter->ReadInt(&temp))
+  if (!m->ReadInt(iter, &temp))
     return false;
   *r = LongToHandle(temp);
   return true;
 }
 
 void ParamTraits<HANDLE>::Log(const param_type& p, std::string* l) {
   l->append(base::StringPrintf("0x%X", p));
 }
 
 void ParamTraits<LOGFONT>::Write(Message* m, const param_type& p) {
   m->WriteData(reinterpret_cast<const char*>(&p), sizeof(LOGFONT));
 }
 
 bool ParamTraits<LOGFONT>::Read(const Message* m, PickleIterator* iter,
                                 param_type* r) {
   const char *data;
   int data_size = 0;
-  if (iter->ReadData(&data, &data_size) && data_size == sizeof(LOGFONT)) {
+  if (m->ReadData(iter, &data, &data_size) && data_size == sizeof(LOGFONT)) {
     const LOGFONT *font = reinterpret_cast<LOGFONT*>(const_cast<char*>(data));
     if (_tcsnlen(font->lfFaceName, LF_FACESIZE) < LF_FACESIZE) {
       memcpy(r, data, sizeof(LOGFONT));
       return true;
     }
   }
 
   NOTREACHED();
   return false;
 }
 
 void ParamTraits<LOGFONT>::Log(const param_type& p, std::string* l) {
   l->append(base::StringPrintf("<LOGFONT>"));
 }
 
 void ParamTraits<MSG>::Write(Message* m, const param_type& p) {
   m->WriteData(reinterpret_cast<const char*>(&p), sizeof(MSG));
 }
 
 bool ParamTraits<MSG>::Read(const Message* m, PickleIterator* iter,
                             param_type* r) {
   const char *data;
   int data_size = 0;
-  bool result = iter->ReadData(&data, &data_size);
+  bool result = m->ReadData(iter, &data, &data_size);
   if (result && data_size == sizeof(MSG)) {
     memcpy(r, data, sizeof(MSG));
   } else {
     result = false;
     NOTREACHED();
   }
 
   return result;
 }
 
 void ParamTraits<MSG>::Log(const param_type& p, std::string* l) {
   l->append("<MSG>");
 }
 
 #endif  // OS_WIN
 
 }  // namespace IPC