Revert 191173 "Check in a custom-built import library for user32..."

trunk/src/chrome/chrome_dll.gypi

 # Copyright (c) 2012 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.
 {
   'conditions': [
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
           'target_name': 'chrome_dll',
           'type': 'none',
@@ skipping 70 matching lines @@
             ['use_aura==1', {
               'dependencies': [
                 '../ui/compositor/compositor.gyp:compositor',
               ],
             }],
             ['use_ash==1', {
               'sources': [
                 '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc',
               ],
             }],
-            ['OS=="win" and target_arch=="ia32"', {
-              # Add a dependency to custom import library for user32 delay
-              # imports only in x86 builds.
-              'dependencies': [
-                'chrome_user32_delay_imports',
-              ],
-            },],
             ['OS=="win"', {
               'product_name': 'chrome',
               'dependencies': [
                 # On Windows, link the dependencies (libraries) that make
                 # up actual Chromium functionality into this .dll.
                 'chrome_dll_pdb_workaround',
                 'chrome_resources.gyp:chrome_resources',
                 'chrome_version_resources',
                 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
                 '../content/content.gyp:content_worker',
                 '../crypto/crypto.gyp:crypto',
                 '../printing/printing.gyp:printing',
                 '../net/net.gyp:net_resources',
                 '../third_party/cld/cld.gyp:cld',
                 '../ui/views/views.gyp:views',
                 '../webkit/support/webkit_support.gyp:webkit_resources',
               ],
               'sources': [
                 'app/chrome_command_ids.h',
                 'app/chrome_dll.rc',
                 'app/chrome_dll_resource.h',
                 'app/chrome_main.cc',
                 'app/chrome_main_delegate.cc',
                 'app/chrome_main_delegate.h',
-                'app/delay_load_hook_win.cc',
-                'app/delay_load_hook_win.h',
 
                 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
                 '../base/win/dllmain.cc',
 
                 '../ui/resources/cursors/aliasb.cur',
                 '../ui/resources/cursors/cell.cur',
                 '../ui/resources/cursors/col_resize.cur',
                 '../ui/resources/cursors/copy.cur',
                 '../ui/resources/cursors/none.cur',
                 '../ui/resources/cursors/row_resize.cur',
@@ skipping 37 matching lines @@
                 'VCLinkerTool': {
                   'BaseAddress': '0x01c30000',
                   'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
                   # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
                   'SubSystem': '2',
                   'conditions': [
                     ['incremental_chrome_dll==1', {
                       'OutputFile': '$(OutDir)\\initial\\chrome.dll',
                       'UseLibraryDependencyInputs': "true",
                     }],
-                    ['target_arch=="ia32"', {
-                      # Link against the XP-constrained user32 import library
-                      # instead of the platform-SDK provided one to avoid
-                      # inadvertently taking dependencies on post-XP user32
-                      # exports.
-                      'AdditionalDependencies!': [
-                        'user32.lib',
-                      ],
-                      'IgnoreDefaultLibraryNames': [
-                        'user32.lib',
-                      ],
-                      # Remove user32 delay load for chrome.dll.
-                      'DelayLoadDLLs!': [
-                        'user32.dll',
-                      ],
-                      'AdditionalDependencies': [
-                        'user32.winxp.lib',
-                      ],
-                      'DelayLoadDLLs': [
-                        'user32-delay.dll',
-                      ],
-                      'AdditionalLibraryDirectories': [
-                        '<(DEPTH)/build/win/importlibs/x86',
-                      ],
-                      'ForceSymbolReferences': [
-                        # Force the inclusion of the delay load hook in this
-                        # binary.
-                        'ChromeDelayLoadHook',
-                      ],
-                    }],
                   ],
                   'DelayLoadDLLs': [
                     'comdlg32.dll',
                     'crypt32.dll',
                     'cryptui.dll',
                     'dhcpcsvc.dll',
                     'imagehlp.dll',
                     'imm32.dll',
                     'iphlpapi.dll',
                     'setupapi.dll',
@@ skipping 97 matching lines @@
                 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/chrome.dll.pdb',
               },
              },
             }],
           ],
         },
       ],
     }],
   ],
 }