Revert 246313 "Use an alternate mechanism for CreateFile calls i..."

trunk/src/chrome_elf/chrome_elf.gyp

 # Copyright 2013 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.
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
     '../chrome/version.gypi',
     'blacklist.gypi',
   ],
   'targets': [
-   {
-      'target_name': 'chrome_redirects',
-      'type': 'shared_library',
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'chrome_redirects.def',
-      ],
-      'dependencies': [
-        'chrome_elf_lib',
-      ],
-      'msvs_settings': {
-        'VCLinkerTool': {
-          'BaseAddress': '0x01c10000',
-          # Set /SUBSYSTEM:WINDOWS.
-          'SubSystem': '2',
-        },
-      },
-      'conditions': [
-        ['component=="shared_library"', {
-          # In component builds, all targets depend on chrome_redirects by
-          # default. Remove it here to avoid a circular dependency.
-          'dependencies!': [
-            '../chrome_elf/chrome_elf.gyp:chrome_redirects',
-          ],
-        }],
-      ],
-    },
     {
       'target_name': 'chrome_elf',
       'type': 'shared_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
         'chrome_elf.def',
         'chrome_elf_main.cc',
         'chrome_elf_main.h',
       ],
       'dependencies': [
         'blacklist',
         'chrome_elf_lib',
-        'chrome_redirects',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
           'BaseAddress': '0x01c20000',
-          # Set /SUBSYSTEM:WINDOWS.
+          # Set /SUBSYSTEM:WINDOWS for chrome_elf.dll (for consistency).
           'SubSystem': '2',
           'AdditionalDependencies!': [
             'user32.lib',
           ],
           'IgnoreDefaultLibraryNames': [
             'user32.lib',
           ],
         },
       },
     },
     {
       'target_name': 'chrome_elf_unittests_exe',
       'product_name': 'chrome_elf_unittests',
       'type': 'executable',
       'sources': [
         'blacklist/test/blacklist_test.cc',
-        'create_file/chrome_create_file_unittest.cc',
         'elf_imports_unittest.cc',
         'ntdll_cache_unittest.cc',
       ],
       'include_dirs': [
         '..',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'dependencies': [
         'chrome_elf_lib',
         '../base/base.gyp:base',
@@ skipping 20 matching lines @@
         'chrome_elf_unittests_exe',
       ],
     },
     {
       'target_name': 'chrome_elf_lib',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'chrome_elf_constants.cc',
-        'chrome_elf_constants.h',
         'chrome_elf_types.h',
-        'create_file/chrome_create_file.cc',
-        'create_file/chrome_create_file.h',
         'ntdll_cache.cc',
         'ntdll_cache.h',
       ],
-      'conditions': [
-        ['component=="shared_library"', {
-          # In component builds, all targets depend on chrome_redirects by
-          # default. Remove it here to avoid a circular dependency.
-          'dependencies!': [
-            '../chrome_elf/chrome_elf.gyp:chrome_redirects',
-          ],
-        }],
-      ],
     },
   ],
 }