Revert of Remove deprecated methods from Pickle.

ui/gfx/ipc/gfx_param_traits.cc

Index: ui/gfx/ipc/gfx_param_traits.cc
diff --git a/ui/gfx/ipc/gfx_param_traits.cc b/ui/gfx/ipc/gfx_param_traits.cc
index a4a004c01ec7d61748bfec3c7cef2661a6147bbe..caf1a2362d0b5d80d85619a6af9cec260f06f811 100644
--- a/ui/gfx/ipc/gfx_param_traits.cc
+++ b/ui/gfx/ipc/gfx_param_traits.cc
@@ -59,8 +59,8 @@
 bool ParamTraits<gfx::Point>::Read(const Message* m, PickleIterator* iter,
                                    gfx::Point* r) {
   int x, y;
-  if (!iter->ReadInt(&x) ||
-      !iter->ReadInt(&y))
+  if (!m->ReadInt(iter, &x) ||
+      !m->ReadInt(iter, &y))
     return false;
   r->set_x(x);
   r->set_y(y);
@@ -103,7 +103,7 @@
                                   PickleIterator* iter,
                                   gfx::Size* r) {
   const char* char_values;
-  if (!iter->ReadBytes(&char_values, sizeof(int) * 2))
+  if (!m->ReadBytes(iter, &char_values, sizeof(int) * 2))
     return false;
   const int* values = reinterpret_cast<const int*>(char_values);
   if (values[0] < 0 || values[1] < 0)
@@ -126,7 +126,7 @@
                                    PickleIterator* iter,
                                    gfx::SizeF* r) {
   const char* char_values;
-  if (!iter->ReadBytes(&char_values, sizeof(float) * 2))
+  if (!m->ReadBytes(iter, &char_values, sizeof(float) * 2))
     return false;
   const float* values = reinterpret_cast<const float*>(char_values);
   r->set_width(values[0]);
@@ -147,7 +147,7 @@
                                       PickleIterator* iter,
                                       gfx::Vector2d* r) {
   const char* char_values;
-  if (!iter->ReadBytes(&char_values, sizeof(int) * 2))
+  if (!m->ReadBytes(iter, &char_values, sizeof(int) * 2))
     return false;
   const int* values = reinterpret_cast<const int*>(char_values);
   r->set_x(values[0]);
@@ -168,7 +168,7 @@
                                       PickleIterator* iter,
                                       gfx::Vector2dF* r) {
   const char* char_values;
-  if (!iter->ReadBytes(&char_values, sizeof(float) * 2))
+  if (!m->ReadBytes(iter, &char_values, sizeof(float) * 2))
     return false;
   const float* values = reinterpret_cast<const float*>(char_values);
   r->set_x(values[0]);
@@ -189,7 +189,7 @@
                                   PickleIterator* iter,
                                   gfx::Rect* r) {
   const char* char_values;
-  if (!iter->ReadBytes(&char_values, sizeof(int) * 4))
+  if (!m->ReadBytes(iter, &char_values, sizeof(int) * 4))
     return false;
   const int* values = reinterpret_cast<const int*>(char_values);
   if (values[2] < 0 || values[3] < 0)
@@ -212,7 +212,7 @@
                                    PickleIterator* iter,
                                    gfx::RectF* r) {
   const char* char_values;
-  if (!iter->ReadBytes(&char_values, sizeof(float) * 4))
+  if (!m->ReadBytes(iter, &char_values, sizeof(float) * 4))
     return false;
   const float* values = reinterpret_cast<const float*>(char_values);
   r->SetRect(values[0], values[1], values[2], values[3]);
@@ -241,7 +241,7 @@
                                  SkBitmap* r) {
   const char* fixed_data;
   int fixed_data_size = 0;
-  if (!iter->ReadData(&fixed_data, &fixed_data_size) ||
+  if (!m->ReadData(iter, &fixed_data, &fixed_data_size) ||
      (fixed_data_size <= 0)) {
     NOTREACHED();
     return false;
@@ -251,7 +251,7 @@
 
   const char* variable_data;
   int variable_data_size = 0;
-  if (!iter->ReadData(&variable_data, &variable_data_size) ||
+  if (!m->ReadData(iter, &variable_data, &variable_data_size) ||
      (variable_data_size < 0)) {
     NOTREACHED();
     return false;