Fixes to gyp files to get test_shell building on windows from a gyp project (...

webkit/tools/test_shell/test_shell.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../../../build/common.gypi',
@@ skipping 71 matching lines @@
       ],
       'conditions': [
         ['OS!="linux"', {'sources/': [['exclude', '_gtk\\.cc$']]}],
         ['OS!="mac"', {
           'sources/': [
             ['exclude', 'mac/[^/]*\\.(cc|mm?)$'],
             ['exclude', '_mac\\.(cc|mm?)$'],
           ]
         }],
         ['OS=="win"', {
-          'include_dirs': [
-            '../../../breakpad/src',
+          'msvs_disabled_warnings': [ 4800 ],
+          'link_settings': {
+            'libraries': [
+              '-lcomctl32.lib',
+            ],
+          },
+          'dependencies': [
+            '../../../breakpad/breakpad.gyp:breakpad_handler',
           ],
-          'msvs_disabled_warnings': [ 4800 ],
         }, {  # OS!=win
           'sources/': [
             ['exclude', '_win\\.cc$']
           ],
           'sources!': [
             'drag_delegate.cc',
             'drop_delegate.cc',
           ],
         }],
       ],
@@ skipping 79 matching lines @@
           'sources!': [
             '../../../skia/ext/vector_canvas_unittest.cc',
             '../webcore_unit_tests/UniscribeHelper_unittest.cpp',
             'plugin_tests.cc'
           ],
         }],
       ],
     },
   ],
 }