Revert 98909 - Use chain-loading for Linux nacl_helper

chrome/common/chrome_paths.cc

 // 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.
 
 #include "chrome/common/chrome_paths.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 35 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.
+// File name of the nacl_helper, Linux only.
 const FilePath::CharType kInternalNaClHelperFileName[] =
-    FILE_PATH_LITERAL("nacl_helper");
-const FilePath::CharType kInternalNaClHelperBootstrapFileName[] =
     FILE_PATH_LITERAL("nacl_helper_bootstrap");
 #endif
 
 }  // namespace
 
 namespace chrome {
 
 // Gets the path for internal plugins.
 bool GetInternalPluginsDirectory(FilePath* result) {
 #if defined(OS_MACOSX)
@@ skipping 171 matching lines @@
       if (!GetInternalPluginsDirectory(&cur))
         return false;
       cur = cur.Append(kInternalNaClPluginFileName);
       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;
 #endif
     case chrome::FILE_RESOURCES_PACK:
 #if defined(OS_MACOSX)
       if (base::mac::AmIBundled()) {
         cur = base::mac::MainAppBundlePath();
         cur = cur.Append(FILE_PATH_LITERAL("Resources"))
                  .Append(FILE_PATH_LITERAL("resources.pak"));
         break;
       }
       // If we're not bundled on mac, resources.pak should be next to the
@@ skipping 99 matching lines @@
   return true;
 }
 
 // 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);
 }
 
 }  // namespace chrome