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

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 06f8c17934d0d014f905fa368caa56dde298f76e..9e239db2b4abdf03bc9f42f736d00b129d3ac1b1 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -62,9 +62,12 @@
 #include <signal.h>
 #endif
 
+#if !defined(DISABLE_NACL)
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "chrome/app/nacl_fork_delegate_linux.h"
+#include "chrome/common/nacl_paths.h"
 #endif
+#endif // !defined(DISABLE_NACL)
 
 #if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
@@ -474,6 +477,11 @@ void ChromeMainDelegate::PreSandboxStartup() {
 #if defined(OS_CHROMEOS)
   chromeos::RegisterPathProvider();
 #endif
+#if !defined(DISABLE_NACL)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)

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

This can be
#if !defined(DISABLE_NACL) && defined(OS_LINUX)

nacl_helper_bootstrap is very Linux-specific.  It's not likely to work on
another Unix without a lot of modification.

+  nacl::RegisterPathProvider();
+#endif
+#endif // !defined(DISABLE_NACL)
 
 #if defined(OS_MACOSX)
   // On the Mac, the child executable lives at a predefined location within