Revert of Remove deprecated methods from Pickle.

content/browser/zygote_host/zygote_host_impl_linux.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/browser/zygote_host/zygote_host_impl_linux.h"
 
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 351 matching lines @@
         return base::kNullProcessHandle;
     }
 
     // Read the reply, which pickles the PID and an optional UMA enumeration.
     static const unsigned kMaxReplyLength = 2048;
     char buf[kMaxReplyLength];
     const ssize_t len = ReadReply(buf, sizeof(buf));
 
     Pickle reply_pickle(buf, len);
     PickleIterator iter(reply_pickle);
-    if (len <= 0 || !iter.ReadInt(&pid))
+    if (len <= 0 || !reply_pickle.ReadInt(&iter, &pid))
       return base::kNullProcessHandle;
 
     // If there is a nonempty UMA name string, then there is a UMA
     // enumeration to record.
     std::string uma_name;
     int uma_sample;
     int uma_boundary_value;
-    if (iter.ReadString(&uma_name) &&
+    if (reply_pickle.ReadString(&iter, &uma_name) &&
         !uma_name.empty() &&
-        iter.ReadInt(&uma_sample) &&
-        iter.ReadInt(&uma_boundary_value)) {
+        reply_pickle.ReadInt(&iter, &uma_sample) &&
+        reply_pickle.ReadInt(&iter, &uma_boundary_value)) {
       // We cannot use the UMA_HISTOGRAM_ENUMERATION macro here,
       // because that's only for when the name is the same every time.
       // Here we're using whatever name we got from the other side.
       // But since it's likely that the same one will be used repeatedly
       // (even though it's not guaranteed), we cache it here.
       static base::HistogramBase* uma_histogram;
       if (!uma_histogram || uma_histogram->histogram_name() != uma_name) {
         uma_histogram = base::LinearHistogram::FactoryGet(
             uma_name, 1,
             uma_boundary_value,
@@ skipping 131 matching lines @@
   int status = base::TERMINATION_STATUS_NORMAL_TERMINATION;
 
   if (len == -1) {
     LOG(WARNING) << "Error reading message from zygote: " << errno;
   } else if (len == 0) {
     LOG(WARNING) << "Socket closed prematurely.";
   } else {
     Pickle read_pickle(buf, len);
     int tmp_status, tmp_exit_code;
     PickleIterator iter(read_pickle);
-    if (!iter.ReadInt(&tmp_status) || !iter.ReadInt(&tmp_exit_code)) {
+    if (!read_pickle.ReadInt(&iter, &tmp_status) ||
+        !read_pickle.ReadInt(&iter, &tmp_exit_code)) {
       LOG(WARNING)
           << "Error parsing GetTerminationStatus response from zygote.";
     } else {
       if (exit_code)
         *exit_code = tmp_exit_code;
       status = tmp_status;
     }
   }
 
   if (status != base::TERMINATION_STATUS_STILL_RUNNING) {
     ZygoteChildDied(handle);
   }
   return static_cast<base::TerminationStatus>(status);
 }
 
 pid_t ZygoteHostImpl::GetPid() const {
   return pid_;
 }
 
 int ZygoteHostImpl::GetSandboxStatus() const {
   if (have_read_sandbox_status_word_)
     return sandbox_status_;
   return 0;
 }
 
 }  // namespace content