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

chrome/app/chrome_main_delegate.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/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
@@ skipping 44 matching lines @@
 #include "chrome/common/mac/objc_zombie.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #endif
 
 #if defined(OS_POSIX)
 #include <locale.h>
 #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"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chromeos/chromeos_paths.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/common/descriptors_android.h"
 #endif
@@ skipping 389 matching lines @@
 
 void ChromeMainDelegate::PreSandboxStartup() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
   chrome::RegisterPathProvider();
 #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
   // the app bundle's versioned directory.
   PathService::Override(content::CHILD_PROCESS_EXE,
                         chrome::GetVersionedDirectory().
                         Append(chrome::kHelperProcessExecutablePath));
 
   InitMacCrashReporter(command_line, process_type);
 #endif
@@ skipping 226 matching lines @@
 
 content::ContentRendererClient*
     ChromeMainDelegate::CreateContentRendererClient() {
   return &g_chrome_content_renderer_client.Get();
 }
 
 content::ContentUtilityClient*
     ChromeMainDelegate::CreateContentUtilityClient() {
   return &g_chrome_content_utility_client.Get();
 }