Revert 223585 "Revert 223398 "Remove old chromedriver from build..."

trunk/src/chrome/chrome_tests.gypi

 # Copyright 2013 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 486 matching lines @@
           'msvs_disabled_warnings': [ 4267, ],
         }, { # else: OS != "win"
           'sources!': [
             'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
             'browser/ui/views/native_widget_win_interactive_uitest.cc',
           ],
         }],  # OS != "win"
       ],  # conditions
     },
     {
-      # Third-party support sources for chromedriver_lib.
-      'target_name': 'chromedriver_support',
-      'type': 'static_library',
-      'sources': [
-        '../third_party/mongoose/mongoose.c',
-        '../third_party/mongoose/mongoose.h',
-        '../third_party/webdriver/atoms.cc',
-        '../third_party/webdriver/atoms.h',
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      # Although this one is probably safe to ignore.
-      # Mongose casts -1 directly as HANDLE (definitely safe to ignore).
-      'msvs_disabled_warnings': [4267, 4306, ],
-   },
-    {
-      # chromedriver is the chromium implementation of WebDriver.
-      # See http://www.chromium.org/developers/testing/webdriver-for-chrome
-      'target_name': 'chromedriver_lib',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../net/net.gyp:net',
-        '../skia/skia.gyp:skia',
-        '../sync/sync.gyp:sync',
-        '../testing/gtest.gyp:gtest',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-        '../third_party/libxml/libxml.gyp:libxml',
-        '../url/url.gyp:url_lib',
-        'browser',
-        'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
-        'chromedriver_support',
-        'common',
-        'test_support_ui',
-        'test_support_ui_runner',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'test/webdriver/commands/alert_commands.cc',
-        'test/webdriver/commands/alert_commands.h',
-        'test/webdriver/commands/appcache_status_command.cc',
-        'test/webdriver/commands/appcache_status_command.h',
-        'test/webdriver/commands/browser_connection_commands.cc',
-        'test/webdriver/commands/browser_connection_commands.h',
-        'test/webdriver/commands/chrome_commands.cc',
-        'test/webdriver/commands/chrome_commands.h',
-        'test/webdriver/commands/command.cc',
-        'test/webdriver/commands/command.h',
-        'test/webdriver/commands/cookie_commands.cc',
-        'test/webdriver/commands/cookie_commands.h',
-        'test/webdriver/commands/create_session.cc',
-        'test/webdriver/commands/create_session.h',
-        'test/webdriver/commands/execute_async_script_command.cc',
-        'test/webdriver/commands/execute_async_script_command.h',
-        'test/webdriver/commands/execute_command.cc',
-        'test/webdriver/commands/execute_command.h',
-        'test/webdriver/commands/file_upload_command.cc',
-        'test/webdriver/commands/file_upload_command.h',
-        'test/webdriver/commands/find_element_commands.cc',
-        'test/webdriver/commands/find_element_commands.h',
-        'test/webdriver/commands/html5_location_commands.cc',
-        'test/webdriver/commands/html5_location_commands.h',
-        'test/webdriver/commands/html5_storage_commands.cc',
-        'test/webdriver/commands/html5_storage_commands.h',
-        'test/webdriver/commands/keys_command.cc',
-        'test/webdriver/commands/keys_command.h',
-        'test/webdriver/commands/log_command.cc',
-        'test/webdriver/commands/log_command.h',
-        'test/webdriver/commands/navigate_commands.cc',
-        'test/webdriver/commands/navigate_commands.h',
-        'test/webdriver/commands/mouse_commands.cc',
-        'test/webdriver/commands/mouse_commands.h',
-        'test/webdriver/commands/response.h',
-        'test/webdriver/commands/response.cc',
-        'test/webdriver/commands/screenshot_command.cc',
-        'test/webdriver/commands/screenshot_command.h',
-        'test/webdriver/commands/session_with_id.cc',
-        'test/webdriver/commands/session_with_id.h',
-        'test/webdriver/commands/set_timeout_commands.cc',
-        'test/webdriver/commands/set_timeout_commands.h',
-        'test/webdriver/commands/source_command.cc',
-        'test/webdriver/commands/source_command.h',
-        'test/webdriver/commands/target_locator_commands.cc',
-        'test/webdriver/commands/target_locator_commands.h',
-        'test/webdriver/commands/title_command.cc',
-        'test/webdriver/commands/title_command.h',
-        'test/webdriver/commands/url_command.cc',
-        'test/webdriver/commands/url_command.h',
-        'test/webdriver/commands/webdriver_command.cc',
-        'test/webdriver/commands/webdriver_command.h',
-        'test/webdriver/commands/webelement_commands.cc',
-        'test/webdriver/commands/webelement_commands.h',
-        'test/webdriver/commands/window_commands.cc',
-        'test/webdriver/commands/window_commands.h',
-        'test/webdriver/frame_path.cc',
-        'test/webdriver/frame_path.h',
-        'test/webdriver/http_response.cc',
-        'test/webdriver/http_response.h',
-        'test/webdriver/keycode_text_conversion.h',
-        'test/webdriver/keycode_text_conversion_gtk.cc',
-        'test/webdriver/keycode_text_conversion_mac.mm',
-        'test/webdriver/keycode_text_conversion_win.cc',
-        'test/webdriver/keycode_text_conversion_x.cc',
-        'test/webdriver/webdriver_automation.cc',
-        'test/webdriver/webdriver_automation.h',
-        'test/webdriver/webdriver_basic_types.cc',
-        'test/webdriver/webdriver_basic_types.h',
-        'test/webdriver/webdriver_capabilities_parser.cc',
-        'test/webdriver/webdriver_capabilities_parser.h',
-        'test/webdriver/webdriver_dispatch.cc',
-        'test/webdriver/webdriver_dispatch.h',
-        'test/webdriver/webdriver_element_id.cc',
-        'test/webdriver/webdriver_element_id.h',
-        'test/webdriver/webdriver_error.cc',
-        'test/webdriver/webdriver_error.h',
-        'test/webdriver/webdriver_key_converter.cc',
-        'test/webdriver/webdriver_key_converter.h',
-        'test/webdriver/webdriver_logging.cc',
-        'test/webdriver/webdriver_logging.h',
-        'test/webdriver/webdriver_session.cc',
-        'test/webdriver/webdriver_session.h',
-        'test/webdriver/webdriver_session_manager.cc',
-        'test/webdriver/webdriver_session_manager.h',
-        'test/webdriver/webdriver_switches.cc',
-        'test/webdriver/webdriver_switches.h',
-        'test/webdriver/webdriver_util.cc',
-        'test/webdriver/webdriver_util.h',
-        'test/webdriver/webdriver_util_mac.mm',
-      ],
-      'conditions': [
-        ['use_x11==1', {
-          'dependencies': [
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-          ],
-        }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-          'sources!': [
-            'test/webdriver/keycode_text_conversion_x.cc',
-          ],
-        }],
-        ['toolkit_uses_gtk == 0', {
-          'sources!': [
-            'test/webdriver/keycode_text_conversion_gtk.cc',
-          ],
-        }],
-        ['OS=="linux" and toolkit_views==1', {
-          'dependencies': [
-            '../ui/views/views.gyp:views',
-          ],
-        }],
-        ['os_posix == 1 and OS != "mac" and OS != "android"', {
-          'conditions': [
-            ['linux_use_tcmalloc==1', {
-              'dependencies': [
-                '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-        }],
-      ],
-    },
-    {
-      'target_name': 'chromedriver',
-      'type': 'executable',
-      'dependencies': [
-        'chromedriver_lib',
-        '../base/base.gyp:base',
-        '../skia/skia.gyp:skia',
-        '../testing/gtest.gyp:gtest',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'test/webdriver/webdriver_server.cc',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lOleAcc.lib',
-              '-lws2_32.lib',
-            ],
-          },
-          'configurations': {
-            'Debug': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-                },
-              },
-            },
-          },
-        }],
-      ]
-    },
-    {
-      'target_name': 'chromedriver_unittests',
-      'type': 'executable',
-      'dependencies': [
-        'chromedriver_lib',
-        '../base/base.gyp:run_all_unittests',
-        '../base/base.gyp:test_support_base',
-        '../testing/gtest.gyp:gtest',
-        '../testing/perf/perf_test.gyp:*',
-        '../skia/skia.gyp:skia',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'test/webdriver/commands/set_timeout_commands_unittest.cc',
-        'test/webdriver/frame_path_unittest.cc',
-        'test/webdriver/http_response_unittest.cc',
-        'test/webdriver/keycode_text_conversion_unittest.cc',
-        'test/webdriver/webdriver_capabilities_parser_unittest.cc',
-        'test/webdriver/webdriver_dispatch_unittest.cc',
-        'test/webdriver/webdriver_key_converter_unittest.cc',
-        'test/webdriver/webdriver_test_util.cc',
-        'test/webdriver/webdriver_test_util.h',
-        'test/webdriver/webdriver_util_unittest.cc',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lOleAcc.lib',
-              '-lws2_32.lib',
-            ],
-          },
-          'configurations': {
-            'Debug': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-                },
-              },
-            },
-          },
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4267, ],
-        }],
-      ],
-    },
-    {
       'target_name': 'chrome_devtools_lib',
       'type': 'static_library',
       'hard_dependency': 1,
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../net/net.gyp:net',
         '../third_party/zlib/zlib.gyp:minizip',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/ui.gyp:ui',
@@ skipping 2732 matching lines @@
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
           ],
         }]
     }],
   ],  # 'conditions'
 }