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

chrome/app/chrome_main.cc

Index: chrome/app/chrome_main.cc
===================================================================
--- chrome/app/chrome_main.cc	(revision 90812)
+++ chrome/app/chrome_main.cc	(working copy)
@@ -47,11 +47,6 @@
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-#include "chrome/common/nacl_fork_delegate_linux.h"
-#include "content/common/zygote_fork_delegate_linux.h"
-#endif
-
 #if defined(OS_WIN)
 #include <algorithm>
 #include <malloc.h>
@@ -117,9 +112,7 @@
 extern int NaClMain(const MainFunctionParams&);
 extern int UtilityMain(const MainFunctionParams&);
 extern int ProfileImportMain(const MainFunctionParams&);
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-extern int ZygoteMain(const MainFunctionParams&, const ZygoteForkDelegate&);
-#endif
+extern int ZygoteMain(const MainFunctionParams&);
 #if defined(_WIN64)
 extern int NaClBrokerMain(const MainFunctionParams&);
 #endif
@@ -457,8 +450,7 @@
     media::InitializeMediaLibrary(media_path);
 
   // This function call can return multiple times, once per fork().
-  NaClForkDelegate nacl_fork_delegate;
-  if (!ZygoteMain(main_function_params, nacl_fork_delegate))
+  if (!ZygoteMain(main_function_params))
     return 1;
 
   // Zygote::HandleForkRequest may have reallocated the command
Property changes on: chrome/app/chrome_main.cc
___________________________________________________________________
Added: svn:mergeinfo