Revert of Remove deprecated methods from Pickle.

content/public/common/common_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/public/common/common_param_traits.h"
 
 #include <string>
 
 #include "content/public/common/content_constants.h"
 #include "content/public/common/page_state.h"
@@ skipping 17 matching lines @@
     m->WriteString(std::string());
     return;
   }
 
   m->WriteString(p.possibly_invalid_spec());
   // TODO(brettw) bug 684583: Add encoding for query params.
 }
 
 bool ParamTraits<GURL>::Read(const Message* m, PickleIterator* iter, GURL* p) {
   std::string s;
-  if (!iter->ReadString(&s) || s.length() > content::GetMaxURLChars()) {
+  if (!m->ReadString(iter, &s) || s.length() > content::GetMaxURLChars()) {
     *p = GURL();
     return false;
   }
   *p = GURL(s);
   if (!s.empty() && !p->is_valid()) {
     *p = GURL();
     return false;
   }
   return true;
 }
 
 void ParamTraits<GURL>::Log(const GURL& p, std::string* l) {
   l->append(p.spec());
 }
 
 void ParamTraits<url::Origin>::Write(Message* m,
                                           const url::Origin& p) {
   m->WriteString(p.string());
 }
 
 bool ParamTraits<url::Origin>::Read(const Message* m,
                                     PickleIterator* iter,
                                     url::Origin* p) {
   std::string s;
-  if (!iter->ReadString(&s)) {
+  if (!m->ReadString(iter, &s)) {
     *p = url::Origin();
     return false;
   }
   *p = url::Origin(s);
   return true;
 }
 
 void ParamTraits<url::Origin>::Log(const url::Origin& p, std::string* l) {
   l->append(p.string());
 }
@@ skipping 80 matching lines @@
 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
 #include "content/public/common/common_param_traits_macros.h"
 }  // namespace IPC
 
 // Generate param traits log methods.
 #include "ipc/param_traits_log_macros.h"
 namespace IPC {
 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
 #include "content/public/common/common_param_traits_macros.h"
 }  // namespace IPC