Revert of Remove deprecated methods from Pickle.

content/zygote/zygote_linux.h

 // 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.
 
 #ifndef CONTENT_ZYGOTE_ZYGOTE_H_
 #define CONTENT_ZYGOTE_ZYGOTE_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 43 matching lines @@
   // Returns true if the SUID sandbox is active.
   bool UsingSUIDSandbox() const;
 
   // ---------------------------------------------------------------------------
   // Requests from the browser...
 
   // Read and process a request from the browser. Returns true if we are in a
   // new process and thus need to unwind back into ChromeMain.
   bool HandleRequestFromBrowser(int fd);
 
-  void HandleReapRequest(int fd, PickleIterator iter);
+  void HandleReapRequest(int fd, const Pickle& pickle, PickleIterator iter);
 
   // Get the termination status of |real_pid|. |real_pid| is the PID as it
   // appears outside of the sandbox.
   // Return true if it managed to get the termination status and return the
   // status in |status| and the exit code in |exit_code|.
   bool GetTerminationStatus(base::ProcessHandle real_pid, bool known_dead,
                             base::TerminationStatus* status,
                             int* exit_code);
 
   void HandleGetTerminationStatus(int fd,
+                                  const Pickle& pickle,
                                   PickleIterator iter);
 
   // This is equivalent to fork(), except that, when using the SUID sandbox, it
   // returns the real PID of the child process as it appears outside the
   // sandbox, rather than returning the PID inside the sandbox.  The child's
   // real PID is determined by having it call content::SendZygoteChildPing(int)
   // using the |pid_oracle| descriptor.
   // Finally, when using a ZygoteForkDelegate helper, |uma_name|, |uma_sample|,
   // and |uma_boundary_value| may be set if the helper wants to make a UMA
   // report via UMA_HISTOGRAM_ENUMERATION.
   int ForkWithRealPid(const std::string& process_type,
                       const base::GlobalDescriptors::Mapping& fd_mapping,
                       const std::string& channel_id,
                       base::ScopedFD pid_oracle,
                       std::string* uma_name,
                       int* uma_sample,
                       int* uma_boundary_value);
 
-  // Unpacks process type and arguments from |iter| and forks a new process.
+  // Unpacks process type and arguments from |pickle| and forks a new process.
   // Returns -1 on error, otherwise returns twice, returning 0 to the child
   // process and the child process ID to the parent process, like fork().
-  base::ProcessId ReadArgsAndFork(PickleIterator iter,
+  base::ProcessId ReadArgsAndFork(const Pickle& pickle,
+                                  PickleIterator iter,
                                   ScopedVector<base::ScopedFD> fds,
                                   std::string* uma_name,
                                   int* uma_sample,
                                   int* uma_boundary_value);
 
   // Handle a 'fork' request from the browser: this means that the browser
   // wishes to start a new renderer. Returns true if we are in a new process,
   // otherwise writes the child_pid back to the browser via |fd|. Writes a
   // child_pid of -1 on error.
   bool HandleForkRequest(int fd,
+                         const Pickle& pickle,
                          PickleIterator iter,
                          ScopedVector<base::ScopedFD> fds);
 
   bool HandleGetSandboxStatus(int fd,
+                              const Pickle& pickle,
                               PickleIterator iter);
 
   // The Zygote needs to keep some information about each process. Most
   // notably what the PID of the process is inside the PID namespace of
   // the Zygote and whether or not a process was started by the
   // ZygoteForkDelegate helper.
   ZygoteProcessMap process_info_map_;
 
   const int sandbox_flags_;
   ScopedVector<ZygoteForkDelegate> helpers_;
 
   // Count of how many fork delegates for which we've invoked InitialUMA().
   size_t initial_uma_index_;
 
   // This vector contains the PIDs of any child processes which have been
   // created prior to the construction of the Zygote object, and must be reaped
   // before the Zygote exits. The Zygote will perform a blocking wait on these
   // children, so they must be guaranteed to be exiting by the time the Zygote
   // exits.
   std::vector<base::ProcessHandle> extra_children_;
 
   // This vector contains the FDs that must be closed before reaping the extra
   // children.
   std::vector<int> extra_fds_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_ZYGOTE_ZYGOTE_H_