Revert 97056 - Gyp fix for release build.

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 22 matching lines @@
   DIR_DEFAULT_DOWNLOADS,        // Directory for a user's downloads.
   DIR_USER_DATA_TEMP,           // A temp directory within DIR_USER_DATA.  Use
                                 // this when a temporary file or directory will
                                 // be moved into the profile, to avoid issues
                                 // moving across volumes.  See crbug.com/13044 .
                                 // Getting this path does not create it.  Users
                                 // should check that the path exists before
                                 // using it.
   DIR_INTERNAL_PLUGINS,         // Directory where internal plugins reside.
   DIR_MEDIA_LIBS,               // Directory where the Media libraries reside.
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && defined(OS_POSIX)
   DIR_POLICY_FILES,             // Directory for system-wide read-only
                                 // policy files that allow sys-admins
                                 // to set policies for chrome. This directory
                                 // contains subdirectories.
 #endif
 #if defined(OS_MACOSX)
   DIR_MANAGED_PREFS,            // Directory that stores the managed prefs plist
                                 // files for the current user.
 #endif
 #if defined(OS_CHROMEOS)
   DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions.
                                  // Used for OEM customization on Chrome OS.
                                  // Getting this path does not create it.
 #endif
 
   DIR_EXTERNAL_EXTENSIONS,      // Directory where installer places .crx files.
   FILE_RESOURCE_MODULE,         // Full path and filename of the module that
                                 // contains embedded resources (version,
                                 // strings, images, etc.).
   FILE_LOCAL_STATE,             // Path and filename to the file in which
                                 // 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.
-#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__