Dropping --nacl-loader-cmd-prefix

components/nacl/browser/nacl_process_host.cc

Index: components/nacl/browser/nacl_process_host.cc
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index eae244b46c386212b76cbfae106e5aa38bbad23a..9ba546193689c5fe783661dad2c3107851d10bfe 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -494,12 +494,6 @@ bool NaClProcessHost::LaunchSelLdr() {
     return false;
   }
 
-  CommandLine::StringType nacl_loader_prefix;
-#if defined(OS_POSIX)
-  nacl_loader_prefix = CommandLine::ForCurrentProcess()->GetSwitchValueNative(
-      switches::kNaClLoaderCmdPrefix);
-#endif  // defined(OS_POSIX)
-
   // Build command line for nacl.
 
 #if defined(OS_MACOSX)
@@ -511,8 +505,7 @@ bool NaClProcessHost::LaunchSelLdr() {
   // http://code.google.com/p/nativeclient/issues/detail?id=2043.
   int flags = ChildProcessHost::CHILD_NO_PIE;
 #elif defined(OS_LINUX)
-  int flags = nacl_loader_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF :
-                                           ChildProcessHost::CHILD_NORMAL;
+  int flags = ChildProcessHost::CHILD_ALLOW_SELF;
 #else
   int flags = ChildProcessHost::CHILD_NORMAL;
 #endif
@@ -567,9 +560,6 @@ bool NaClProcessHost::LaunchSelLdr() {
   if (NaClBrowser::GetDelegate()->DialogsAreSuppressed())
     cmd_line->AppendSwitch(switches::kNoErrorDialogs);
 
-  if (!nacl_loader_prefix.empty())
-    cmd_line->PrependWrapper(nacl_loader_prefix);
-
   // On Windows we might need to start the broker process to launch a new loader
 #if defined(OS_WIN)
   if (RunningOnWOW64()) {
@@ -584,7 +574,7 @@ bool NaClProcessHost::LaunchSelLdr() {
                      cmd_line.release());
   }
 #elif defined(OS_POSIX)
-  process_->Launch(nacl_loader_prefix.empty(),  // use_zygote
+  process_->Launch(true,  // use_zygote
                    base::EnvironmentMap(),
                    cmd_line.release());
 #endif