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

chrome/common/chrome_paths.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/common/chrome_paths.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/path_service.h"
@@ skipping 47 matching lines @@
 #if defined(OS_WIN)
     FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll");
 #elif defined(OS_MACOSX)
     // TODO(noelallen) Please verify this extention name is correct.
     FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin");
 #else  // Linux and Chrome OS
     FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so");
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
-// File name of the nacl_helper and nacl_helper_bootstrap, Linux only.
-const base::FilePath::CharType kInternalNaClHelperFileName[] =
-    FILE_PATH_LITERAL("nacl_helper");
-const base::FilePath::CharType kInternalNaClHelperBootstrapFileName[] =
-    FILE_PATH_LITERAL("nacl_helper_bootstrap");
-#endif
-
-
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
 
 const base::FilePath::CharType kO3DPluginFileName[] =
     FILE_PATH_LITERAL("pepper/libppo3dautoplugin.so");
 
 const base::FilePath::CharType kO1DPluginFileName[] =
     FILE_PATH_LITERAL("pepper/libppo1d.so");
 
 const base::FilePath::CharType kGTalkPluginFileName[] =
     FILE_PATH_LITERAL("pepper/libppgoogletalk.so");
 
@@ skipping 217 matching lines @@
         cur = cur.DirName();
         cur = cur.DirName();
       }
 #else
       if (!GetInternalPluginsDirectory(&cur))
         return false;
 #endif
       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
       break;
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
-    case chrome::FILE_NACL_HELPER:
-      if (!PathService::Get(base::DIR_MODULE, &cur))
-        return false;
-      cur = cur.Append(kInternalNaClHelperFileName);
-      break;
-    case chrome::FILE_NACL_HELPER_BOOTSTRAP:
-      if (!PathService::Get(base::DIR_MODULE, &cur))
-        return false;
-      cur = cur.Append(kInternalNaClHelperBootstrapFileName);
-      break;
     case chrome::FILE_O3D_PLUGIN:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
       cur = cur.Append(kO3DPluginFileName);
       break;
     case chrome::FILE_O1D_PLUGIN:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
       cur = cur.Append(kO1DPluginFileName);
       break;
@@ skipping 197 matching lines @@
 
 // This cannot be done as a static initializer sadly since Visual Studio will
 // eliminate this object file if there is no direct entry point into it.
 void RegisterPathProvider() {
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
   PathService::RegisterProvider(
       PathProvider, breakpad::PATH_START, breakpad::PATH_END);
 }
 
 }  // namespace chrome