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..0af58a4a6ca01f0512c15b728de852e200c60797 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -23,6 +23,7 @@
 #include "crypto/nss_util.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/diagnostics/diagnostics_main.h"
+#include "chrome/nacl/nacl_fork_delegate_linux.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
@@ -113,7 +114,8 @@ 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&);
+extern int ZygoteMain(const MainFunctionParams&,
+                      ZygoteForkDelegate* forkdelegate);
 #if defined(_WIN64)
 extern int NaClBrokerMain(const MainFunctionParams&);
 #endif
@@ -439,7 +441,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