Index: chrome/nacl/nacl_fork_delegate_linux.cc |
diff --git a/chrome/nacl/nacl_fork_delegate_linux.cc b/chrome/nacl/nacl_fork_delegate_linux.cc |
index 26fae5386d13f478ddc16b7a28ae88db6d728b45..93b0a8415482488e2ea4ed0c5e5f430c6295cc0c 100644 |
--- a/chrome/nacl/nacl_fork_delegate_linux.cc |
+++ b/chrome/nacl/nacl_fork_delegate_linux.cc |
@@ -44,15 +44,10 @@ void NaClForkDelegate::Init(const bool sandboxed, |
base::file_handle_mapping_vector fds_to_map; |
fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor)); |
fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor)); |
- // TODO(bradchen): To make this the default for release builds, |
- // remove command line switch. |
ready_ = false; |
- const bool use_helper = CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kNaClLinuxHelper); |
FilePath helper_exe; |
FilePath helper_bootstrap_exe; |
- if (use_helper && |
- PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) && |
+ if (PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) && |
PathService::Get(chrome::FILE_NACL_HELPER_BOOTSTRAP, |
&helper_bootstrap_exe)) { |
CommandLine::StringVector argv = CommandLine::ForCurrentProcess()->argv(); |