Revert of Remove deprecated methods from Pickle.

content/common/content_param_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 "content/common/content_param_traits.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "content/common/input/web_input_event_traits.h"
 #include "net/base/ip_endpoint.h"
 #include "ui/gfx/range/range.h"
 
 namespace IPC {
 
 void ParamTraits<gfx::Range>::Write(Message* m, const gfx::Range& r) {
   m->WriteSizeT(r.start());
   m->WriteSizeT(r.end());
 }
 
 bool ParamTraits<gfx::Range>::Read(const Message* m,
                                   PickleIterator* iter,
                                   gfx::Range* r) {
   size_t start, end;
-  if (!iter->ReadSizeT(&start) || !iter->ReadSizeT(&end))
+  if (!m->ReadSizeT(iter, &start) || !m->ReadSizeT(iter, &end))
     return false;
   r->set_start(start);
   r->set_end(end);
   return true;
 }
 
 void ParamTraits<gfx::Range>::Log(const gfx::Range& r, std::string* l) {
   l->append(base::StringPrintf("(%" PRIuS ", %" PRIuS ")", r.start(), r.end()));
 }
 
 void ParamTraits<WebInputEventPointer>::Write(Message* m, const param_type& p) {
   m->WriteData(reinterpret_cast<const char*>(p), p->size);
 }
 
 bool ParamTraits<WebInputEventPointer>::Read(const Message* m,
                                              PickleIterator* iter,
                                              param_type* r) {
   const char* data;
   int data_length;
-  if (!iter->ReadData(&data, &data_length)) {
+  if (!m->ReadData(iter, &data, &data_length)) {
     NOTREACHED();
     return false;
   }
   if (data_length < static_cast<int>(sizeof(blink::WebInputEvent))) {
     NOTREACHED();
     return false;
   }
   param_type event = reinterpret_cast<param_type>(data);
   // Check that the data size matches that of the event.
   if (data_length != static_cast<int>(event->size)) {
@@ skipping 36 matching lines @@
 #undef CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_
 #include "content/common/content_param_traits_macros.h"
 }  // namespace IPC
 
 // Generate param traits log methods.
 #include "ipc/param_traits_log_macros.h"
 namespace IPC {
 #undef CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_
 #include "content/common/content_param_traits_macros.h"
 }  // namespace IPC