New NaCl zygote implementation 2

content/browser/child_process_launcher.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/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 109 matching lines @@
         cmd_line->GetSwitchValueASCII(switches::kProcessType);
     int crash_signal_fd =
         content::GetContentClient()->browser()->GetCrashSignalFD(process_type);
     if (use_zygote) {
       base::GlobalDescriptors::Mapping mapping;
       mapping.push_back(std::pair<uint32_t, int>(kPrimaryIPCChannel, ipcfd));
       if (crash_signal_fd >= 0) {
         mapping.push_back(std::pair<uint32_t, int>(kCrashDumpSignal,
                                                    crash_signal_fd));
       }
-      handle = ZygoteHost::GetInstance()->ForkRenderer(cmd_line->argv(),
-                                                       mapping);
+      handle = ZygoteHost::GetInstance()->ForkRequest(cmd_line->argv(),
+                                                      mapping,
+                                                      process_type);
     } else
     // Fall through to the normal posix case below when we're not zygoting.
 #endif
     {
       base::file_handle_mapping_vector fds_to_map;
       fds_to_map.push_back(std::make_pair(
           ipcfd,
           kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ skipping 225 matching lines @@
           context_.get(),
           &ChildProcessLauncher::Context::SetProcessBackgrounded,
           background));
 }
 
 void ChildProcessLauncher::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
   if (context_)
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }
-