Take out the activex control.

chrome/chrome.gyp

Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp	(revision 25626)
+++ chrome/chrome.gyp	(working copy)
@@ -5391,8 +5391,6 @@
             '../rlz/rlz.gyp:*',
             '../sandbox/sandbox.gyp:*',
             '../tools/memory_watcher/memory_watcher.gyp:*',
-            '../webkit/activex_shim/activex_shim.gyp:*',
-            '../webkit/activex_shim_dll/activex_shim_dll.gyp:*',
             '../v8/tools/gyp/v8.gyp:v8_shell',
           ],
         },
@@ -5452,33 +5450,6 @@
           ],
         },
         {
-          'target_name': 'activex_test_control',
-          'type': 'shared_library',
-          'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC',
-          'include_dirs': [
-            '..',
-            '<(INTERMEDIATE_DIR)',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lcomsuppw.lib',
-            ],
-          },
-          'sources': [
-            'test/activex_test_control/activex_test_control.cc',
-            'test/activex_test_control/activex_test_control.def',
-            'test/activex_test_control/activex_test_control.idl',
-            'test/activex_test_control/activex_test_control.rc',
-            'test/activex_test_control/activex_test_control.rgs',
-            'test/activex_test_control/chrome_test_control.bmp',
-            'test/activex_test_control/chrome_test_control.cc',
-            'test/activex_test_control/chrome_test_control.h',
-            'test/activex_test_control/chrome_test_control.rgs',
-            'test/activex_test_control/chrome_test_control_cp.h',
-            'test/activex_test_control/resource.h',
-          ],
-        },
-        {
           'target_name': 'automation',
           'type': '<(library)',
           'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12',