Fix the tree. It looks like the previous change (19561)

did not work as expected, since most of the windows
machines are red trying to load dwmapi.dll, which should
be in the delay load list.

I'm reverting part of this change.

TBR:bradnelson
Review URL: http://codereview.chromium.org/150102

git-svn-id: http://src.chromium.org/svn/trunk/src/build@19581 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -60,11 +60,6 @@
     # Once all vsprops settings are migrated into gyp, this can go away.
     'msvs_use_common_release%': 1,
 
-    # TODO(bradnelson): eliminate this when possible.
-    # To allow local gyp files to override additional linker options for msvs.
-    # Yes(1) means set use the common linker options.
-    'msvs_use_common_linker_extras%': 1,
-
     # TODO(sgk): eliminate this if possible.
     # It would be nicer to support this via a setting in 'target_defaults'
     # in chrome/app/locales/locales.gypi overriding the setting in the
@@ -488,6 +483,8 @@
               ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
           },
           'VCLinkerTool': {
+            'AdditionalOptions':
+              '/safeseh:NO /dynamicbase:NO /ignore:4199 /ignore:4221 /nxcompat',
             'AdditionalDependencies': [
               'wininet.lib',
               'version.lib',
@@ -499,6 +496,11 @@
             ],
             'AdditionalLibraryDirectories':
               ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
+            'DelayLoadDLLs': [
+              'dbghelp.dll',
+              'dwmapi.dll',
+              'uxtheme.dll',
+            ],
             'GenerateDebugInformation': 'true',
             'MapFileName': '$(OutDir)\\$(TargetName).map',
             'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
@@ -543,17 +545,6 @@
         ],
       },
     }],
-    ['msvs_use_common_linker_extras', {
-      'VCLinkerTool': {
-        'AdditionalOptions':
-          '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
-        'DelayLoadDLLs': [
-          'dbghelp.dll',
-          'dwmapi.dll',
-          'uxtheme.dll',
-        ],
-      },
-    }],
   ],
   'scons_settings': {
     'sconsbuild_dir': '<(DEPTH)/sconsbuild',