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

chrome/app/chrome_main.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 "chrome/app/chrome_main.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/i18n/icu_util.h"
@@ skipping 29 matching lines @@
 #include "content/common/content_paths.h"
 #include "content/common/main_function_params.h"
 #include "content/common/sandbox_init_wrapper.h"
 #include "content/common/set_process_title.h"
 #include "ipc/ipc_switches.h"
 #include "media/base/media.h"
 #include "ui/base/resource/resource_bundle.h"
 #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>
 #include "base/string_util.h"
 #include "base/win/registry.h"
 #include "sandbox/src/sandbox.h"
 #include "tools/memory_watcher/memory_watcher.h"
 #endif
 
 #if defined(OS_MACOSX)
@@ skipping 45 matching lines @@
 extern int BrowserMain(const MainFunctionParams&);
 extern int RendererMain(const MainFunctionParams&);
 extern int GpuMain(const MainFunctionParams&);
 extern int PluginMain(const MainFunctionParams&);
 extern int PpapiPluginMain(const MainFunctionParams&);
 extern int PpapiBrokerMain(const MainFunctionParams&);
 extern int WorkerMain(const MainFunctionParams&);
 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
 extern int ServiceProcessMain(const MainFunctionParams&);
 
 #if defined(OS_WIN)
 // TODO(erikkay): isn't this already defined somewhere?
 #define DLLEXPORT __declspec(dllexport)
 
 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling.
@@ skipping 317 matching lines @@
   };
 
   // Each Renderer we spawn will re-attempt initialization of the media
   // libraries, at which point failure will be detected and handled, so
   // we do not need to cope with initialization failures here.
   FilePath media_path;
   if (PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path))
     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
   // line so update it here with the new version.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   // The StatsTable must be initialized in each process; we already
   // initialized for the browser process, now we need to initialize
   // within the new processes as well.
   pid_t browser_pid = base::GetParentProcessId(
@@ skipping 390 matching lines @@
 
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 
   logging::CleanupChromeLogging();
 
   chrome_main::LowLevelShutdown();
 
   return exit_code;
 }