Revert of Remove deprecated methods from Pickle.

gpu/ipc/gpu_command_buffer_traits.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 "gpu/ipc/gpu_command_buffer_traits.h"
 
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "gpu/command_buffer/common/value_state.h"
 
 // Generate param traits write methods.
@@ skipping 45 matching lines @@
 }
 
 void ParamTraits<gpu::Mailbox>::Write(Message* m, const param_type& p) {
   m->WriteBytes(p.name, sizeof(p.name));
 }
 
 bool ParamTraits<gpu::Mailbox>::Read(const Message* m,
                                      PickleIterator* iter,
                                      param_type* p) {
   const char* bytes = NULL;
-  if (!iter->ReadBytes(&bytes, sizeof(p->name)))
+  if (!m->ReadBytes(iter, &bytes, sizeof(p->name)))
     return false;
   DCHECK(bytes);
   memcpy(p->name, bytes, sizeof(p->name));
   return true;
 }
 
 void ParamTraits<gpu::Mailbox>::Log(const param_type& p, std::string* l) {
   for (size_t i = 0; i < sizeof(p.name); ++i)
     *l += base::StringPrintf("%02x", p.name[i]);
 }
@@ skipping 22 matching lines @@
 void ParamTraits<gpu::ValueState>::Write(Message* m, const param_type& p) {
   m->WriteData(reinterpret_cast<const char*>(&p),
                sizeof(gpu::ValueState));
 }
 
 bool ParamTraits<gpu::ValueState>::Read(const Message* m,
                                         PickleIterator* iter,
                                         param_type* p) {
   int length;
   const char* data = NULL;
-  if (!iter->ReadData(&data, &length) || length != sizeof(gpu::ValueState))
+  if (!m->ReadData(iter, &data, &length) || length != sizeof(gpu::ValueState))
     return false;
   DCHECK(data);
   memcpy(p, data, sizeof(gpu::ValueState));
   return true;
 }
 
 void ParamTraits<gpu::ValueState>::Log(const param_type& p, std::string* l) {
   l->append("<ValueState (");
   for (size_t i = 0; i < sizeof(p.int_value); ++i)
     *l += base::StringPrintf("%i ", p.int_value[i]);
   l->append(" int values ");
   for (size_t i = 0; i < sizeof(p.float_value); ++i)
     *l += base::StringPrintf("%f ", p.float_value[i]);
   l->append(" float values)>");
 }
 
 }  // namespace IPC