Revert of Remove deprecated methods from Pickle.

content/common/cc_messages.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 "content/common/cc_messages.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/filter_operations.h"
 #include "cc/quads/largest_draw_quad.h"
 #include "content/public/common/common_param_traits.h"
@@ skipping 210 matching lines @@
     m->WriteData(static_cast<const char*>(data->data()), data->size());
   } else {
     m->WriteData(0, 0);
   }
 }
 
 bool ParamTraits<skia::RefPtr<SkImageFilter> >::Read(
     const Message* m, PickleIterator* iter, param_type* r) {
   const char* data = 0;
   int length = 0;
-  if (!iter->ReadData(&data, &length))
+  if (!m->ReadData(iter, &data, &length))
     return false;
   if (length > 0) {
     SkFlattenable* flattenable = SkValidatingDeserializeFlattenable(
         data, length, SkImageFilter::GetFlattenableType());
     *r = skia::AdoptRef(static_cast<SkImageFilter*>(flattenable));
   } else {
     r->clear();
   }
   return true;
 }
@@ skipping 13 matching lines @@
 #else
   double column_major_data[16];
   p.matrix().asColMajord(column_major_data);
 #endif
   m->WriteBytes(&column_major_data, sizeof(SkMScalar) * 16);
 }
 
 bool ParamTraits<gfx::Transform>::Read(
     const Message* m, PickleIterator* iter, param_type* r) {
   const char* column_major_data;
-  if (!iter->ReadBytes(&column_major_data, sizeof(SkMScalar) * 16))
+  if (!m->ReadBytes(iter, &column_major_data, sizeof(SkMScalar) * 16))
     return false;
   r->matrix().setColMajor(
       reinterpret_cast<const SkMScalar*>(column_major_data));
   return true;
 }
 
 void ParamTraits<gfx::Transform>::Log(
     const param_type& p, std::string* l) {
 #ifdef SK_MSCALAR_IS_FLOAT
   float row_major_data[16];
@@ skipping 512 matching lines @@
   l->append(", ");
   LogParam(p.size, l);
   l->append(", ");
   LogParam(p.damage_rect, l);
   l->append(", ");
   LogParam(p.bitmap_id, l);
   l->append(")");
 }
 
 }  // namespace IPC