Stop delay loading user32.dll from chrome.dll on x86/Windows.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index adc137df4a11089f5c3b691d6e0d24af567d03af..9b71eef3cd47c7c7e562176d64df384dc3f25f35 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2217,7 +2217,6 @@
               'shell32.lib',
               'ole32.lib',
               'oleaut32.lib',
-              'user32.lib',
               'uuid.lib',
               'odbc32.lib',
               'odbccp32.lib',
@@ -2315,6 +2314,9 @@
             # Note that this is a three-way bool, where 0 means to pick up
             # the default setting, 1 is off and 2 is on.
             'RandomizedBaseAddress': 1,
+            # In debug builds we link with the Platform SDK user32.dll import
+            # library.
+            'AdditionalDependencies': [ 'user32.lib' ],
           },
           'VCResourceCompilerTool': {
             'PreprocessorDefinitions': ['_DEBUG'],
@@ -4011,6 +4013,17 @@
                   '/ignore:4221',
                   '/nxcompat',
                 ],
+                'AdditionalLibraryDirectories': [
+                  '<(DEPTH)/build/win/importlibs/x86',
+                ],
+                # Link against the XP-constrained user32 import library to avoid
+                # inadvertently taking dependencies on post-XP user32 exports.
+                'AdditionalDependencies': [
+                  'user32.winxp.lib',
+                ],
+                'IgnoreDefaultLibraryNames': [
+                  'user32.lib',
+                ],
               },
             },
           },
@@ -4024,6 +4037,15 @@
                   '/ignore:4221',
                   '/nxcompat',
                 ],
+                'AdditionalLibraryDirectories': [
+                  '<(DEPTH)/build/win/importlibs/x64',
+                ],
+                # On X64 we link against the SDK's user32 import library.
+                # TODO(siggi): the right thing to do here is probably to
+                #     link against the Vista-level X64 import library.

[M-A Ruel, 2013/03/03 01:48:02]

I'd prefer to not break the 5 Win2k3 users once chrome x64 gets out.

[Sigurður Ásgeirsson, 2013/03/25 20:43:29]

I've reduced the patch in scope to only affect chrome.dll on x86.

+                'AdditionalDependencies': [
+                  'user32.lib',
+                ],
               },
             },
           },