Revert 90681 - New NaCl zygote implementation 2, in which Chrome zygote forks a NaCl helper.

This patch can launch earth_c.html with and without the SUID sandbox. It is enabled with the environment variable NACL_NEW_ZYGOTE.

BUG=nativeclient:480
TEST=nativeclient in-browser tests on Linux, ChromeOS

Review URL: http://codereview.chromium.org/6995121

TBR=bradchen@google.com
Review URL: http://codereview.chromium.org/7274011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90682 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 40 deletions

diff --git a/base/process_util.h b/base/process_util.h
index 9f66669..3e758d4 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -286,15 +286,6 @@ BASE_API bool LaunchAppInNewProcessGroup(
     bool wait,
     ProcessHandle* process_handle);
 
-#if defined(OS_LINUX)
-// Similar to LaunchApp variants above except uses clone(.. clone_flags ..)
-// rather than fork(). This is useful for work inside the setuid sandbox.
-BASE_API bool LaunchAppWithClone(const std::vector<std::string>& argv,
-                                 const file_handle_mapping_vector& fds_to_remap,
-                                 bool wait, ProcessHandle* process_handle,
-                                 int clone_flags);
-#endif
-
 // AlterEnvironment returns a modified environment vector, constructed from the
 // given environment and the list of changes given in |changes|. Each key in
 // the environment is matched against the first element of the pairs. In the
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index b41ca4b..a2398ed 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -508,9 +508,7 @@ bool LaunchAppImpl(
     const file_handle_mapping_vector& fds_to_remap,
     bool wait,
     ProcessHandle* process_handle,
-    bool start_new_process_group,
-    bool use_clone,
-    int clone_flags) {
+    bool start_new_process_group) {
   pid_t pid;
   InjectiveMultimap fd_shuffle1, fd_shuffle2;
   fd_shuffle1.reserve(fds_to_remap.size());
@@ -518,15 +516,7 @@ bool LaunchAppImpl(
   scoped_array<char*> argv_cstr(new char*[argv.size() + 1]);
   scoped_array<char*> new_environ(AlterEnvironment(env_changes, environ));
 
-  if (use_clone) {
-#if defined(OS_LINUX)
-    pid = syscall(__NR_clone, clone_flags, 0, 0, 0);
-#else
-    NOTREACHED() << "Tried to use clone() on non-Linux system.";
-#endif
-  } else {
-    pid = fork();
-  }
+  pid = fork();
   if (pid < 0) {
     PLOG(ERROR) << "fork";
     return false;
@@ -627,10 +617,7 @@ bool LaunchApp(
     bool wait,
     ProcessHandle* process_handle) {
   return LaunchAppImpl(argv, env_changes, fds_to_remap,
-                       wait, process_handle,
-                       false,  // don't start new process group
-                       false,  // don't use clone()
-                       0);     // clone flags
+                       wait, process_handle, false);
 }
 
 bool LaunchAppInNewProcessGroup(
@@ -640,21 +627,7 @@ bool LaunchAppInNewProcessGroup(
     bool wait,
     ProcessHandle* process_handle) {
   return LaunchAppImpl(argv, env_changes, fds_to_remap, wait,
-                       process_handle,
-                       true,   // start new process group
-                       false,  // don't use clone()
-                       0);     // clone flags
-}
-
-BASE_API bool LaunchAppWithClone(const std::vector<std::string>& argv,
-                                 const file_handle_mapping_vector& fds_to_remap,
-                                 bool wait, ProcessHandle* process_handle,
-                                 int clone_flags) {
-  base::environment_vector no_env;
-  return LaunchAppImpl(argv, no_env, fds_to_remap, wait, process_handle,
-                       false,  // don't start new process group
-                       true,   // use clone()
-                       clone_flags);
+                       process_handle, true);
 }
 
 bool LaunchApp(const std::vector<std::string>& argv,