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

trunk/src/chrome/chrome_dll.gypi

Index: trunk/src/chrome/chrome_dll.gypi
===================================================================
--- trunk/src/chrome/chrome_dll.gypi	(revision 191178)
+++ trunk/src/chrome/chrome_dll.gypi	(working copy)
@@ -88,13 +88,6 @@
                 '<(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': [
@@ -119,8 +112,6 @@
                 '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',
@@ -178,36 +169,6 @@
                       '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',