Refactor chromedriver's script execution to reduce amount of custom Value parsing.

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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',
@@ skipping 128 matching lines @@
         'test/automation/browser_proxy.h',
         'test/automation/dom_element_proxy.cc',
         'test/automation/dom_element_proxy.h',
         'test/automation/extension_proxy.cc',
         'test/automation/extension_proxy.h',
         'test/automation/javascript_execution_controller.cc',
         'test/automation/javascript_execution_controller.h',
         'test/automation/javascript_message_utils.h',
         'test/automation/tab_proxy.cc',
         'test/automation/tab_proxy.h',
+        'test/automation/value_conversion_traits.cc',
+        'test/automation/value_conversion_traits.h',
+        'test/automation/value_conversion_util.h',
         'test/automation/window_proxy.cc',
         'test/automation/window_proxy.h',
         'test/base/bookmark_load_observer.cc',
         'test/base/bookmark_load_observer.h',
         'test/base/chrome_process_util.cc',
         'test/base/chrome_process_util.h',
         'test/base/chrome_process_util_mac.cc',
         'test/base/chrome_test_suite.cc',
         'test/base/chrome_test_suite.h',
         'test/base/in_process_browser_test.cc',
@@ skipping 652 matching lines @@
         }],
         ['chromeos==1', {
           'sources!': [
               # TODO(thestig): Enable when print preview is ready for CrOS.
              'browser/ui/webui/print_preview_ui_uitest.cc',
           ],
         }],
       ],
     },
     {
+      # 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.h',
+      ],
+    },
+    {
       # chromedriver is the chromium impelmentation of the WebDriver
       # wire protcol.  A description of the WebDriver and examples can
       # be found at: http://seleniumhq.org/docs/09_webdriver.html.
       # The documention of the protocol implemented is at:
       # http://code.google.com/p/selenium/wiki/JsonWireProtocol
       'target_name': 'chromedriver_lib',
       'type': 'static_library',
       'dependencies': [
         'browser',
         'chrome',
         'chrome_resources',
         'chrome_strings',
+        'chromedriver_support',
         'common',
         'syncapi_core',
         'test_support_ui',
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        '../third_party/mongoose/mongoose.h',
-        '../third_party/mongoose/mongoose.c',
-        '../third_party/webdriver/atoms.h',
+        'test/webdriver/automation.cc',
         'test/webdriver/automation.h',
-        'test/webdriver/automation.cc',
+        '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/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/find_element_commands.cc',
+        'test/webdriver/commands/find_element_commands.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/dispatch.cc',
         'test/webdriver/dispatch.h',
-        'test/webdriver/dispatch.cc',
+        'test/webdriver/frame_path.cc',
         'test/webdriver/frame_path.h',
-        'test/webdriver/frame_path.cc',
+        'test/webdriver/http_response.cc',
         'test/webdriver/http_response.h',
-        'test/webdriver/http_response.cc',
         'test/webdriver/keycode_text_conversion.h',
         'test/webdriver/keycode_text_conversion_linux.cc',
         'test/webdriver/keycode_text_conversion_mac.mm',
         'test/webdriver/keycode_text_conversion_win.cc',
+        'test/webdriver/keymap.cc',
         'test/webdriver/keymap.h',
-        'test/webdriver/keymap.cc',
+        'test/webdriver/session.cc',
         'test/webdriver/session.h',
-        'test/webdriver/session.cc',
+        'test/webdriver/session_manager.cc',
         'test/webdriver/session_manager.h',
-        'test/webdriver/session_manager.cc',
-        'test/webdriver/utility_functions.h',
-        'test/webdriver/utility_functions.cc',
-        'test/webdriver/utility_functions_mac.mm',
+        'test/webdriver/webdriver_basic_types.cc',
+        'test/webdriver/webdriver_basic_types.h',
+        'test/webdriver/webdriver_error.cc',
         'test/webdriver/webdriver_error.h',
-        'test/webdriver/webdriver_error.cc',
+        '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_logging.cc',
-        'test/webdriver/webdriver_key_converter.h',
-        'test/webdriver/webdriver_key_converter.cc',
+        'test/webdriver/webdriver_util.cc',
+        'test/webdriver/webdriver_util.h',
+        'test/webdriver/webdriver_util_mac.mm',
+        'test/webdriver/web_element_id.cc',
         'test/webdriver/web_element_id.h',
-        'test/webdriver/web_element_id.cc',
-        'test/webdriver/commands/alert_commands.h',
-        'test/webdriver/commands/alert_commands.cc',
-        'test/webdriver/commands/appcache_status_command.h',
-        'test/webdriver/commands/appcache_status_command.cc',
-        'test/webdriver/commands/browser_connection_commands.h',
-        'test/webdriver/commands/browser_connection_commands.cc',
-        'test/webdriver/commands/command.h',
-        'test/webdriver/commands/command.cc',
-        'test/webdriver/commands/cookie_commands.h',
-        'test/webdriver/commands/cookie_commands.cc',
-        'test/webdriver/commands/create_session.h',
-        'test/webdriver/commands/create_session.cc',
-        'test/webdriver/commands/execute_async_script_command.h',
-        'test/webdriver/commands/execute_async_script_command.cc',
-        'test/webdriver/commands/execute_command.h',
-        'test/webdriver/commands/execute_command.cc',
-        'test/webdriver/commands/find_element_commands.h',
-        'test/webdriver/commands/find_element_commands.cc',
-        'test/webdriver/commands/navigate_commands.h',
-        'test/webdriver/commands/navigate_commands.cc',
-        'test/webdriver/commands/mouse_commands.h',
-        'test/webdriver/commands/mouse_commands.cc',
-        'test/webdriver/commands/response.cc',
-        'test/webdriver/commands/response.h',
-        'test/webdriver/commands/screenshot_command.h',
-        'test/webdriver/commands/screenshot_command.cc',
-        'test/webdriver/commands/session_with_id.h',
-        'test/webdriver/commands/session_with_id.cc',
-        'test/webdriver/commands/set_timeout_commands.h',
-        'test/webdriver/commands/set_timeout_commands.cc',
-        'test/webdriver/commands/source_command.h',
-        'test/webdriver/commands/source_command.cc',
-        'test/webdriver/commands/target_locator_commands.h',
-        'test/webdriver/commands/target_locator_commands.cc',
-        'test/webdriver/commands/title_command.h',
-        'test/webdriver/commands/title_command.cc',
-        'test/webdriver/commands/url_command.h',
-        'test/webdriver/commands/url_command.cc',
-        'test/webdriver/commands/webdriver_command.h',
-        'test/webdriver/commands/webdriver_command.cc',
-        'test/webdriver/commands/webelement_commands.h',
-        'test/webdriver/commands/webelement_commands.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="linux" and toolkit_views==1', {
           'dependencies': [
@@ skipping 65 matching lines @@
       'include_dirs': [
         '..',
       ],
       'sources': [
         '../base/test/run_all_unittests.cc',
         'test/webdriver/commands/set_timeout_commands_unittest.cc',
         'test/webdriver/dispatch_unittest.cc',
         'test/webdriver/frame_path_unittest.cc',
         'test/webdriver/http_response_unittest.cc',
         'test/webdriver/keycode_text_conversion_unittest.cc',
-        'test/webdriver/utility_functions_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)',
               ],
             }],
           ],
@@ skipping 3115 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }