Dropping --nacl-loader-cmd-prefix

components/nacl/browser/nacl_process_host.cc

 // Copyright (c) 2012 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 "components/nacl/browser/nacl_process_host.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 476 matching lines @@
   return base::LaunchProcess(cmd_line, base::LaunchOptions(), NULL);
 }
 
 bool NaClProcessHost::LaunchSelLdr() {
   std::string channel_id = process_->GetHost()->CreateChannel();
   if (channel_id.empty()) {
     SendErrorToRenderer("CreateChannel() failed");
     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)
   // The Native Client process needs to be able to allocate a 1GB contiguous
   // region to use as the client environment's virtual address space. ASLR
   // (PIE) interferes with this by making it possible that no gap large enough
   // to accomodate this request will exist in the child process' address
   // space. Disable PIE for NaCl processes. See http://crbug.com/90221 and
   // 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
 
   base::FilePath exe_path = ChildProcessHost::GetChildPath(flags);
   if (exe_path.empty())
     return false;
 
 #if defined(OS_WIN)
   // On Windows 64-bit NaCl loader is called nacl64.exe instead of chrome.exe
@@ skipping 34 matching lines @@
 
   scoped_ptr<CommandLine> cmd_line(new CommandLine(exe_path));
   CopyNaClCommandLineArguments(cmd_line.get());
 
   cmd_line->AppendSwitchASCII(switches::kProcessType,
                               switches::kNaClLoaderProcess);
   cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
   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()) {
     if (!NaClBrokerService::GetInstance()->LaunchLoader(
             weak_factory_.GetWeakPtr(), channel_id)) {
       SendErrorToRenderer("broker service did not launch process");
       return false;
     }
   } else {
     process_->Launch(new NaClSandboxedProcessLauncherDelegate,
                      false,
                      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
 
   return true;
 }
 
 bool NaClProcessHost::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NaClProcessHost, msg)
@@ skipping 448 matching lines @@
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif
 
 }  // namespace nacl