Revert 90805 - I am submitting this with LGTMs from agl@ and evanm@. I'm marking this as TBR=jam@...

content/browser/zygote_host_linux.cc

 // Copyright (c) 2011 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_linux.h"
 
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ skipping 40 matching lines @@
     free(saved_envvar);
   }
 }
 
 ZygoteHost::ZygoteHost()
     : control_fd_(-1),
       pid_(-1),
       init_(false),
       using_suid_sandbox_(false),
       have_read_sandbox_status_word_(false),
-      sandbox_status_(0) {}
+      sandbox_status_(0) {
+}
 
 ZygoteHost::~ZygoteHost() {
   if (init_)
     close(control_fd_);
 }
 
 // static
 ZygoteHost* ZygoteHost::GetInstance() {
   return Singleton<ZygoteHost>::get();
 }
@@ skipping 30 matching lines @@
   // Should this list be obtained from browser_render_process_host.cc?
   static const char* kForwardSwitches[] = {
     switches::kAllowSandboxDebugging,
     switches::kLoggingLevel,
     switches::kEnableLogging,  // Support, e.g., --enable-logging=stderr.
     switches::kV,
     switches::kVModule,
     switches::kRegisterPepperPlugins,
     switches::kDisableSeccompSandbox,
     switches::kEnableSeccompSandbox,
-    switches::kNaClLinuxHelper,
   };
   cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches,
                             arraysize(kForwardSwitches));
 
   content::GetContentClient()->browser()->AppendExtraCommandLineSwitches(
       &cmd_line, -1);
 
   sandbox_binary_ = sandbox_cmd.c_str();
   struct stat st;
 
@@ skipping 91 matching lines @@
                           sizeof(sandbox_status_))) !=
         sizeof(sandbox_status_)) {
       return -1;
     }
     have_read_sandbox_status_word_ = true;
   }
 
   return HANDLE_EINTR(read(control_fd_, buf, buf_len));
 }
 
-pid_t ZygoteHost::ForkRequest(
+pid_t ZygoteHost::ForkRenderer(
     const std::vector<std::string>& argv,
-    const base::GlobalDescriptors::Mapping& mapping,
-    const std::string& process_type) {
+    const base::GlobalDescriptors::Mapping& mapping) {
   DCHECK(init_);
   Pickle pickle;
 
   pickle.WriteInt(kCmdFork);
-  pickle.WriteString(process_type);
   pickle.WriteInt(argv.size());
   for (std::vector<std::string>::const_iterator
        i = argv.begin(); i != argv.end(); ++i)
     pickle.WriteString(*i);
 
   pickle.WriteInt(mapping.size());
 
   std::vector<int> fds;
   for (base::GlobalDescriptors::Mapping::const_iterator
        i = mapping.begin(); i != mapping.end(); ++i) {
@@ skipping 121 matching lines @@
       !read_pickle.ReadInt(&iter, &tmp_exit_code)) {
     LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote.";
     return base::TERMINATION_STATUS_NORMAL_TERMINATION;
   }
 
   if (exit_code)
     *exit_code = tmp_exit_code;
 
   return static_cast<base::TerminationStatus>(status);
 }