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

chrome/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/buildflag_header.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/sanitizers/sanitizers.gni")
@@ skipping 137 matching lines @@
       ]
 
       if (win_console_app) {
         defines += [ "WIN_CONSOLE_APP" ]
       } else {
         # Set /SUBSYSTEM:WINDOWS for chrome.exe itself, unless a console build
         # has been requested.
         configs -= [ "//build/config/win:console" ]
         configs += [ "//build/config/win:windowed" ]
       }
+
+      ldflags = [
+        "/DELAYLOAD:dbghelp.dll",
+        "/DELAYLOAD:dwmapi.dll",
+        "/DELAYLOAD:uxtheme.dll",
+        "/DELAYLOAD:ole32.dll",
+        "/DELAYLOAD:oleaut32.dll",
+      ]
     } else if (use_aura) {
       # Non-Windows aura entrypoint.
       sources += [ "app/chrome_exe_main_aura.cc" ]
     }
 
     if (is_linux) {
       sources += [
         "app/chrome_dll_resource.h",
         "app/chrome_main.cc",
         "app/chrome_main_delegate.cc",
@@ skipping 88 matching lines @@
     sources = [
       "//base/win/dllmain.cc",
       "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/chrome_main_mac.h",
       "app/chrome_main_mac.mm",
-      "app/delay_load_hook_win.cc",
-      "app/delay_load_hook_win.h",
     ]
 
     deps = [
       ":browser_dependencies",
       "//build/config/sanitizers:deps",
       "//chrome/common:features",
       "//third_party/cld_2",
     ]
     if (is_win) {
       output_name = "chrome"
 
       deps += [
         ":chrome_dll_manifest",
         ":chrome_dll_version",
         "//base/trace_event/etw_manifest:chrome_events_win",
         "//chrome/app/theme:chrome_unscaled_resources",
         "//chrome/install_static:install_static_util",
         "//chrome_elf",
         "//components/crash/content/app",
         "//components/policy",
         "//content/app/resources",
         "//crypto",
         "//net:net_resources",
         "//third_party/wtl",
         "//ui/views",
       ]
-      if (current_cpu == "x86") {
-        # TODO(GYP) bug 512861: Lots of VCLinkerTool stuff on Windows.
-        #deps += [ 'chrome_user32_delay_imports' ]  TODO(GYP)
-      }
+
+      ldflags += [
+        "/DELAYLOAD:comdlg32.dll",
+        "/DELAYLOAD:crypt32.dll",
+        "/DELAYLOAD:cryptui.dll",
+        "/DELAYLOAD:dhcpcsvc.dll",
+        "/DELAYLOAD:imagehlp.dll",
+        "/DELAYLOAD:imm32.dll",
+        "/DELAYLOAD:iphlpapi.dll",
+        "/DELAYLOAD:setupapi.dll",
+        "/DELAYLOAD:urlmon.dll",
+        "/DELAYLOAD:winhttp.dll",
+        "/DELAYLOAD:wininet.dll",
+        "/DELAYLOAD:winspool.drv",
+        "/DELAYLOAD:ws2_32.dll",
+        "/DELAYLOAD:wsock32.dll",
+      ]
 
       # This is a large module that can't do incremental linking in some cases.
       configs -= [ "//build/config/win:default_incremental_linking" ]
       configs +=
           [ "//build/config/win:default_large_module_incremental_linking" ]
     }
 
     if (use_aura) {
       deps += [ "//ui/compositor" ]
     }
@@ skipping 1230 matching lines @@
       "//chrome/app/theme/$branding_path_component/product_logo_48.png",
       "//chrome/tools/build/linux/chrome-wrapper",
       "//third_party/xdg-utils/scripts/xdg-mime",
       "//third_party/xdg-utils/scripts/xdg-settings",
     ]
     outputs = [
       "$root_out_dir/{{source_file_part}}",
     ]
   }
 }