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
dednal · Jan 17, 2014 · c44b59f · c44b59f
1 parent 37f6edb
commit c44b59f
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 713 deletions.
diff --git a/build/common.gypi b/build/common.gypi
@@ -2478,13 +2478,6 @@
       ['enable_ipc_fuzzer==1', {
         'defines': ['ENABLE_IPC_FUZZER=1'],
       }],
-      ['OS=="win" and component=="shared_library"', {
-        'dependencies': [
-          # All targets in a component build must depend on chrome_redirects,
-          # to ensure that certain calls go through it.
-          '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_redirects',
-         ],
-      }],
     ],  # conditions for 'target_defaults'
     'target_conditions': [
       ['enable_wexit_time_destructors==1', {

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
@@ -84,11 +84,6 @@
             '../content/content.gyp:content_app_browser',
           ],
           'conditions': [
-            ['OS=="win"', {
-              'dependencies': [
-                '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
-              ],
-            }],
             ['use_aura==1', {
               'dependencies': [
                 '../ui/compositor/compositor.gyp:compositor',
@@ -366,13 +361,6 @@
             'app/chrome_main_delegate.cc',
             'app/chrome_main_delegate.h',
           ],
-          'conditions': [
-            ['OS=="win"', {
-              'dependencies': [
-                '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
-              ],
-            }],
-          ],
         },  # target chrome_child_dll
       ],
     }],

diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
@@ -512,7 +512,6 @@
             '../base/base.gyp:base',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../breakpad/breakpad.gyp:breakpad_sender',
-            '../chrome_elf/chrome_elf.gyp:chrome_elf',
             '../components/components.gyp:breakpad_component',
             '../components/components.gyp:policy',
             '../chrome_elf/chrome_elf.gyp:chrome_elf',

diff --git a/chrome_elf/chrome_elf.def b/chrome_elf/chrome_elf.def
@@ -5,5 +5,4 @@
 LIBRARY  "chrome_elf.dll"
 
 EXPORTS
-  CreateFileW=chrome_redirects.CreateFileW
   SignalChromeElf
diff --git 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',
-          ],
-        }],
-      ],
     },
   ],
 }
diff --git a/chrome_elf/chrome_elf_constants.cc b/chrome_elf/chrome_elf_constants.cc
diff --git a/chrome_elf/chrome_elf_constants.h b/chrome_elf/chrome_elf_constants.h
diff --git a/chrome_elf/chrome_redirects.def b/chrome_elf/chrome_redirects.def