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

chrome/BUILD.gn

Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 7192fa497949454b8695b6c83790da9c32440b4c..af59be20e5f2143b0cf8180213f03cc33ab0f43b 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -155,6 +155,14 @@ if (!is_android && !is_mac) {
         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" ]
@@ -263,8 +271,6 @@ if (is_win) {
       "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 = [
@@ -291,10 +297,23 @@ if (is_win) {
         "//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" ]