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

chrome/app/nacl_fork_delegate_linux.cc

Index: chrome/app/nacl_fork_delegate_linux.cc
diff --git a/chrome/app/nacl_fork_delegate_linux.cc b/chrome/app/nacl_fork_delegate_linux.cc
index c16603daeeb3e4e86d2de3ec6e87ea6273c6a816..58afac05d7f360449c7ce916876538393ab5c1dc 100644
--- a/chrome/app/nacl_fork_delegate_linux.cc
+++ b/chrome/app/nacl_fork_delegate_linux.cc
@@ -23,6 +23,7 @@
 #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),
@@ -50,9 +51,9 @@ void NaClForkDelegate::Init(const int sandboxdesc) {
   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()) {