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

ChromeCreateFileTest.CheckWriteAndReadParams crashes on Vista

> Use an alternate mechanism for CreateFile calls in Chrome
> 
> BUG=334379
> 
> Review URL: https://codereview.chromium.org/138593004

TBR=caitkp@chromium.org

Review URL: https://codereview.chromium.org/140783009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245501 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 45 deletions

diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
index 94dd695..92c8294 100644
--- a/chrome_elf/chrome_elf.gyp
+++ b/chrome_elf/chrome_elf.gyp
@@ -11,35 +11,6 @@
     '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',
@@ -54,12 +25,11 @@
       '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',
@@ -75,7 +45,6 @@
       'type': 'executable',
       'sources': [
         'blacklist/test/blacklist_test.cc',
-        'create_file/chrome_create_file_unittest.cc',
         'elf_imports_unittest.cc',
         'ntdll_cache_unittest.cc',
       ],
@@ -104,23 +73,10 @@
         '..',
       ],
       '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',
-          ],
-        }],
-      ],
     },
   ],
 }