Make chrome.exe/dll GN imports match GYP, remove user32 delay imports.

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': [
     # Dummy target to allow chrome to require chrome_dll to build
     # without actually linking to the library
     ['OS=="mac"', {
       'targets': [
         {
@@ skipping 98 matching lines @@
           },
           'sources': [
             '../base/win/dllmain.cc',
             'app/chrome_command_ids.h',
             'app/chrome_dll_resource.h',
             'app/chrome_main.cc',
             'app/chrome_main_delegate.cc',
             'app/chrome_main_delegate.h',
             'app/chrome_main_mac.h',
             'app/chrome_main_mac.mm',
-            'app/delay_load_hook_win.cc',
-            'app/delay_load_hook_win.h',
           ],
           'dependencies': [
             '<@(chromium_browser_dependencies)',
             'chrome_features.gyp:chrome_common_features',
             'policy_path_parser',
             '../content/content.gyp:content_app_browser',
             '../third_party/cld_2/cld_2.gyp:cld_2',
           ],
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
                 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
                 '<(DEPTH)/chrome/chrome.gyp:install_static_util',
                 '<(DEPTH)/components/components.gyp:policy',
               ],
             }],
             ['use_aura==1', {
               'dependencies': [
                 '../ui/compositor/compositor.gyp:compositor',
               ],
             }],
-            ['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_version_resources',
                 '../base/trace_event/etw_manifest/etw_manifest.gyp:etw_manifest',
                 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
                 '../content/app/resources/content_resources.gyp:content_resources',
                 '../crypto/crypto.gyp:crypto',
@@ skipping 28 matching lines @@
                   # 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"', {
                       # Don't set an x64 base address (to avoid breaking HE-ASLR).
                       'BaseAddress': '0x01c30000',
-                      # 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@8',
-                      ],
                     }],
                   ],
                   'DelayLoadDLLs': [
                     'comdlg32.dll',
                     'crypt32.dll',
                     'cryptui.dll',
                     'dhcpcsvc.dll',
                     'imagehlp.dll',
                     'imm32.dll',
                     'iphlpapi.dll',
@@ skipping 161 matching lines @@
               'dependencies': [
                 '../pdf/pdf.gyp:pdf',
               ],
             }],
           ],
         },  # target chrome_child_dll
       ],
     }],
   ],
 }