New NaCl zygote implementation 2

chrome/app/chrome_main.cc

Index: chrome/app/chrome_main.cc
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index 3eb010130d06adbf1fc881a8f3ee92778f7671fd..02151926c89309acdf0b4458bd5c9a0a96466c05 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -32,6 +32,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
+#include "chrome/common/nacl_fork_delegate_linux.h"
 #include "chrome/common/profiling.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
@@ -43,6 +44,7 @@
 #include "content/common/main_function_params.h"
 #include "content/common/sandbox_init_wrapper.h"
 #include "content/common/set_process_title.h"
+#include "content/common/zygote_fork_delegate_linux.h"
 #include "ipc/ipc_switches.h"
 #include "media/base/media.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -113,7 +115,10 @@ extern int WorkerMain(const MainFunctionParams&);
 extern int NaClMain(const MainFunctionParams&);
 extern int UtilityMain(const MainFunctionParams&);
 extern int ProfileImportMain(const MainFunctionParams&);
-extern int ZygoteMain(const MainFunctionParams&);
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+extern int ZygoteMain(const MainFunctionParams&,
+                      ZygoteForkDelegate* forkdelegate);
+#endif
 #if defined(_WIN64)
 extern int NaClBrokerMain(const MainFunctionParams&);
 #endif
@@ -439,7 +444,7 @@ int RunZygote(const MainFunctionParams& main_function_params) {
     media::InitializeMediaLibrary(media_path);
 
   // This function call can return multiple times, once per fork().
-  if (!ZygoteMain(main_function_params))
+  if (!ZygoteMain(main_function_params, new NaClForkDelegate()))
     return 1;
 
   // Zygote::HandleForkRequest may have reallocated the command