Don't use PathService for the location of nacl_helper and nacl_helper_bootstrap

chrome/app/nacl_fork_delegate_linux.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 "chrome/app/nacl_fork_delegate_linux.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/posix/unix_domain_socket_linux.h"
 #include "base/process_util.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/nacl_helper_linux.h"
+#include "chrome/common/nacl_paths.h"
 
 NaClForkDelegate::NaClForkDelegate()
     : status_(kNaClHelperUnused),
       fd_(-1) {}
 
 // Note these need to match up with their counterparts in nacl_helper_linux.c
 // and nacl_helper_bootstrap_linux.c.
 const char kNaClHelperReservedAtZero[] =
     "--reserved_at_zero=0xXXXXXXXXXXXXXXXX";
 const char kNaClHelperRDebug[] = "--r_debug=0xXXXXXXXXXXXXXXXX";
 
 void NaClForkDelegate::Init(const int sandboxdesc) {
   VLOG(1) << "NaClForkDelegate::Init()";
   int fds[2];
 
   // Confirm a hard-wired assumption.
   // The NaCl constant is from chrome/nacl/nacl_linux_helper.h
   DCHECK(kNaClSandboxDescriptor == sandboxdesc);
 
   CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
   base::FileHandleMappingVector fds_to_map;
   fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor));
   fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor));
 
   status_ = kNaClHelperUnused;
   base::FilePath helper_exe;
   base::FilePath helper_bootstrap_exe;
-  if (!PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe)) {
+  if (!PathService::Get(nacl::FILE_NACL_HELPER, &helper_exe)) {

[Mark Seaborn, 2013/06/21 13:53:26]

FWIW, I don't understand why FILE_NACL_HELPER and FILE_NACL_HELPER_BOOTSTRAP
exist in PathService.  What is this level of indirection needed for?

Why don't we change this code here to do the following?

  if (!PathService::Get(base::DIR_MODULE, &dir)) ...
  base::FilePath path = dir.Append("nacl_helper");

Then we can eliminate all this complexity.

The pathname of nacl64.exe (which you refactored earlier) isn't in PathService.

     status_ = kNaClHelperMissing;
-  } else if (!PathService::Get(chrome::FILE_NACL_HELPER_BOOTSTRAP,
+  } else if (!PathService::Get(nacl::FILE_NACL_HELPER_BOOTSTRAP,
                                &helper_bootstrap_exe)) {
     status_ = kNaClHelperBootstrapMissing;
   } else if (RunningOnValgrind()) {
     status_ = kNaClHelperValgrind;
   } else {
     CommandLine cmd_line(helper_bootstrap_exe);
     cmd_line.AppendArgPath(helper_exe);
     cmd_line.AppendArgNative(kNaClHelperReservedAtZero);
     cmd_line.AppendArgNative(kNaClHelperRDebug);
     base::LaunchOptions options;
@@ skipping 89 matching lines @@
 
 bool NaClForkDelegate::AckChild(const int fd,
                                 const std::string& channel_switch) {
   int nwritten = HANDLE_EINTR(write(fd, channel_switch.c_str(),
                                     channel_switch.length()));
   if (nwritten != static_cast<int>(channel_switch.length())) {
     return false;
   }
   return true;
 }