Revert 98909 - Use chain-loading for Linux nacl_helper

chrome/common/chrome_paths.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_COMMON_CHROME_PATHS_H__
 #define CHROME_COMMON_CHROME_PATHS_H__
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 53 matching lines @@
                                 // machine/installation-specific state is saved.
   FILE_RECORDED_SCRIPT,         // Full path to the script.log file that
                                 // contains recorded browser events for
                                 // playback.
   FILE_FLASH_PLUGIN,            // Full path to the internal Flash plugin file.
   FILE_PEPPER_FLASH_PLUGIN,     // Full path to the pepper Flash plugin file.
   FILE_PDF_PLUGIN,              // Full path to the internal PDF plugin file.
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   FILE_NACL_HELPER,             // Full path to Linux nacl_helper executable.
-  FILE_NACL_HELPER_BOOTSTRAP,   // ... and nacl_helper_bootstrap executable.
 #endif
   FILE_NACL_PLUGIN,             // Full path to the internal NaCl plugin file.
   FILE_LIBAVCODEC,              // Full path to libavcodec media decoding
                                 // library.
   FILE_LIBAVFORMAT,             // Full path to libavformat media parsing
                                 // library.
   FILE_LIBAVUTIL,               // Full path to libavutil media utility library.
   FILE_RESOURCES_PACK,          // Full path to the .pak file containing
                                 // binary data (e.g., html files and images
                                 // used by interal pages).
 #if defined(OS_CHROMEOS)
   FILE_CHROMEOS_API,            // Full path to chrome os api shared object.
 #endif
 
   // Valid only in development environment; TODO(darin): move these
   DIR_TEST_DATA,                // Directory where unit test data resides.
   DIR_TEST_TOOLS,               // Directory where unit test tools reside.
 
   PATH_END
 };
 
 // Call once to register the provider for the path keys defined above.
 void RegisterPathProvider();
 
 }  // namespace chrome
 
 #endif  // CHROME_COMMON_CHROME_PATHS_H__