diff options
| -rw-r--r-- | chrome/chrome_tests.gypi | 234 | ||||
| -rw-r--r-- | chrome/test/chromedriver/README.txt | 30 | ||||
| -rwxr-xr-x | chrome/test/chromedriver/chrome/adb_commands.py (renamed from chrome/test/chromedriver/adb_commands.py) | 0 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome.h (renamed from chrome/test/chromedriver/chrome.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_android_impl.cc (renamed from chrome/test/chromedriver/chrome_android_impl.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_android_impl.h (renamed from chrome/test/chromedriver/chrome_android_impl.h) | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_desktop_impl.cc (renamed from chrome/test/chromedriver/chrome_desktop_impl.cc) | 10 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_desktop_impl.h (renamed from chrome/test/chromedriver/chrome_desktop_impl.h) | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_desktop_impl_unittest.cc (renamed from chrome/test/chromedriver/chrome_desktop_impl_unittest.cc) | 4 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_finder.cc (renamed from chrome/test/chromedriver/chrome_finder.cc) | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_finder.h (renamed from chrome/test/chromedriver/chrome_finder.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_finder_mac.mm (renamed from chrome/test/chromedriver/chrome_finder_mac.mm) | 0 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_finder_unittest.cc (renamed from chrome/test/chromedriver/chrome_finder_unittest.cc) | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_impl.cc (renamed from chrome/test/chromedriver/chrome_impl.cc) | 12 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_impl.h (renamed from chrome/test/chromedriver/chrome_impl.h) | 10 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_impl_unittest.cc (renamed from chrome/test/chromedriver/chrome_impl_unittest.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/devtools_client.cc (renamed from chrome/test/chromedriver/devtools_client.cc) | 4 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/devtools_client.h (renamed from chrome/test/chromedriver/devtools_client.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/devtools_client_impl.cc (renamed from chrome/test/chromedriver/devtools_client_impl.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/devtools_client_impl.h (renamed from chrome/test/chromedriver/devtools_client_impl.h) | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc (renamed from chrome/test/chromedriver/devtools_client_impl_unittest.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/devtools_event_listener.h (renamed from chrome/test/chromedriver/devtools_event_listener.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/dom_tracker.cc (renamed from chrome/test/chromedriver/dom_tracker.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/dom_tracker.h (renamed from chrome/test/chromedriver/dom_tracker.h) | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/dom_tracker_unittest.cc (renamed from chrome/test/chromedriver/dom_tracker_unittest.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/frame_tracker.cc (renamed from chrome/test/chromedriver/frame_tracker.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/frame_tracker.h (renamed from chrome/test/chromedriver/frame_tracker.h) | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/frame_tracker_unittest.cc (renamed from chrome/test/chromedriver/frame_tracker_unittest.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/javascript_dialog_manager.cc (renamed from chrome/test/chromedriver/javascript_dialog_manager.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/javascript_dialog_manager.h (renamed from chrome/test/chromedriver/javascript_dialog_manager.h) | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/javascript_dialog_manager_unittest.cc (renamed from chrome/test/chromedriver/javascript_dialog_manager_unittest.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/local_state.txt (renamed from chrome/test/chromedriver/local_state.txt) | 0 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/navigation_tracker.cc (renamed from chrome/test/chromedriver/navigation_tracker.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/navigation_tracker.h (renamed from chrome/test/chromedriver/navigation_tracker.h) | 10 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc (renamed from chrome/test/chromedriver/navigation_tracker_unittest.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/preferences.txt (renamed from chrome/test/chromedriver/preferences.txt) | 0 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/status.cc (renamed from chrome/test/chromedriver/status.cc) | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/status.h (renamed from chrome/test/chromedriver/status.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/status_unittest.cc (renamed from chrome/test/chromedriver/status_unittest.cc) | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/stub_chrome.cc (renamed from chrome/test/chromedriver/stub_chrome.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/stub_chrome.h (renamed from chrome/test/chromedriver/stub_chrome.h) | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/stub_devtools_client.cc (renamed from chrome/test/chromedriver/stub_devtools_client.cc) | 4 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/stub_devtools_client.h (renamed from chrome/test/chromedriver/stub_devtools_client.h) | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/stub_web_view.cc (renamed from chrome/test/chromedriver/stub_web_view.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/stub_web_view.h (renamed from chrome/test/chromedriver/stub_web_view.h) | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/ui_events.cc (renamed from chrome/test/chromedriver/ui_events.cc) | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/ui_events.h (renamed from chrome/test/chromedriver/ui_events.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/version.cc (renamed from chrome/test/chromedriver/version.cc) | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/version.h (renamed from chrome/test/chromedriver/version.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/web_view.h (renamed from chrome/test/chromedriver/web_view.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/web_view_delegate.h (renamed from chrome/test/chromedriver/web_view_delegate.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/web_view_impl.cc (renamed from chrome/test/chromedriver/web_view_impl.cc) | 20 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/web_view_impl.h (renamed from chrome/test/chromedriver/web_view_impl.h) | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/web_view_impl_unittest.cc (renamed from chrome/test/chromedriver/web_view_impl_unittest.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/zip.cc (renamed from chrome/test/chromedriver/zip.cc) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/zip.h (renamed from chrome/test/chromedriver/zip.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/zip_internal.cc (renamed from chrome/test/chromedriver/zip_internal.cc) | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/zip_internal.h (renamed from chrome/test/chromedriver/zip_internal.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/zip_reader.cc (renamed from chrome/test/chromedriver/zip_reader.cc) | 4 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome/zip_reader.h (renamed from chrome/test/chromedriver/zip_reader.h) | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chrome_launcher_impl.cc | 62 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chromedriver.cc | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/chromedriver_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/command_executor.h | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/command_executor_impl.cc | 4 | ||||
| -rw-r--r-- | chrome/test/chromedriver/command_executor_impl.h | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/command_executor_impl_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/commands.cc | 12 | ||||
| -rw-r--r-- | chrome/test/chromedriver/commands_unittest.cc | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/element_commands.cc | 10 | ||||
| -rw-r--r-- | chrome/test/chromedriver/element_util.cc | 6 | ||||
| -rwxr-xr-x | chrome/test/chromedriver/embed_js_in_cpp.py | 2 | ||||
| -rwxr-xr-x | chrome/test/chromedriver/embed_user_data_dir_in_cpp.py | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/key_converter.cc | 4 | ||||
| -rw-r--r-- | chrome/test/chromedriver/key_converter_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/test/chromedriver/keycode_text_conversion_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/keycode_text_conversion_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/keycode_text_conversion_win.cc | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/keycode_text_conversion_x.cc | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/server/chromedriver_server.cc | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/server/http_handler.cc | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/server/http_handler_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/session.cc | 8 | ||||
| -rw-r--r-- | chrome/test/chromedriver/session_commands.cc | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/session_commands_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/chromedriver/session_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/window_commands.cc | 10 |
87 files changed, 380 insertions, 394 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 54c917b..52a77ef 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -721,8 +721,9 @@ ], }, { - 'target_name': 'chromedriver2_lib', + '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', @@ -734,60 +735,57 @@ ], 'include_dirs': [ '..', - '<(INTERMEDIATE_DIR)', + '<(SHARED_INTERMEDIATE_DIR)', ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)', + ], + }, 'sources': [ - '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/js.cc', - '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/js.h', - '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/user_data_dir.cc', - '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/user_data_dir.h', - '../third_party/webdriver/atoms.cc', - '../third_party/webdriver/atoms.h', - 'test/chromedriver/basic_types.cc', - 'test/chromedriver/basic_types.h', - 'test/chromedriver/chrome.h', - 'test/chromedriver/chrome_finder.cc', - 'test/chromedriver/chrome_finder.h', - 'test/chromedriver/chrome_finder_mac.mm', - 'test/chromedriver/chrome_impl.cc', - 'test/chromedriver/chrome_impl.h', - 'test/chromedriver/chrome_android_impl.cc', - 'test/chromedriver/chrome_android_impl.h', - 'test/chromedriver/chrome_desktop_impl.cc', - 'test/chromedriver/chrome_desktop_impl.h', - 'test/chromedriver/chromedriver.cc', - 'test/chromedriver/chromedriver.h', - 'test/chromedriver/command.h', - 'test/chromedriver/command_executor.h', - 'test/chromedriver/command_executor_impl.cc', - 'test/chromedriver/command_executor_impl.h', - 'test/chromedriver/command_names.cc', - 'test/chromedriver/command_names.h', - 'test/chromedriver/commands.cc', - 'test/chromedriver/commands.h', - 'test/chromedriver/devtools_client.cc', - 'test/chromedriver/devtools_client.h', - 'test/chromedriver/devtools_client_impl.cc', - 'test/chromedriver/devtools_client_impl.h', - 'test/chromedriver/devtools_event_listener.h', - 'test/chromedriver/dom_tracker.cc', - 'test/chromedriver/dom_tracker.h', - 'test/chromedriver/element_commands.cc', - 'test/chromedriver/element_commands.h', - 'test/chromedriver/element_util.cc', - 'test/chromedriver/element_util.h', - 'test/chromedriver/frame_tracker.cc', - 'test/chromedriver/frame_tracker.h', - 'test/chromedriver/javascript_dialog_manager.cc', - 'test/chromedriver/javascript_dialog_manager.h', - 'test/chromedriver/key_converter.cc', - 'test/chromedriver/key_converter.h', - 'test/chromedriver/keycode_text_conversion.h', - 'test/chromedriver/keycode_text_conversion_mac.mm', - 'test/chromedriver/keycode_text_conversion_win.cc', - 'test/chromedriver/keycode_text_conversion_x.cc', - 'test/chromedriver/navigation_tracker.cc', - 'test/chromedriver/navigation_tracker.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.cc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.cc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h', + 'test/chromedriver/chrome/chrome.h', + 'test/chromedriver/chrome/chrome_finder.cc', + 'test/chromedriver/chrome/chrome_finder.h', + 'test/chromedriver/chrome/chrome_finder_mac.mm', + 'test/chromedriver/chrome/chrome_impl.cc', + 'test/chromedriver/chrome/chrome_impl.h', + 'test/chromedriver/chrome/chrome_android_impl.cc', + 'test/chromedriver/chrome/chrome_android_impl.h', + 'test/chromedriver/chrome/chrome_desktop_impl.cc', + 'test/chromedriver/chrome/chrome_desktop_impl.h', + 'test/chromedriver/chrome/devtools_client.cc', + 'test/chromedriver/chrome/devtools_client.h', + 'test/chromedriver/chrome/devtools_client_impl.cc', + 'test/chromedriver/chrome/devtools_client_impl.h', + 'test/chromedriver/chrome/devtools_event_listener.h', + 'test/chromedriver/chrome/dom_tracker.cc', + 'test/chromedriver/chrome/dom_tracker.h', + 'test/chromedriver/chrome/frame_tracker.cc', + 'test/chromedriver/chrome/frame_tracker.h', + 'test/chromedriver/chrome/javascript_dialog_manager.cc', + 'test/chromedriver/chrome/javascript_dialog_manager.h', + 'test/chromedriver/chrome/navigation_tracker.cc', + 'test/chromedriver/chrome/navigation_tracker.h', + 'test/chromedriver/chrome/status.cc', + 'test/chromedriver/chrome/status.h', + 'test/chromedriver/chrome/ui_events.cc', + 'test/chromedriver/chrome/ui_events.h', + 'test/chromedriver/chrome/version.cc', + 'test/chromedriver/chrome/version.h', + 'test/chromedriver/chrome/web_view_delegate.h', + 'test/chromedriver/chrome/web_view.h', + 'test/chromedriver/chrome/web_view_impl.cc', + 'test/chromedriver/chrome/web_view_impl.h', + 'test/chromedriver/chrome/zip.cc', + 'test/chromedriver/chrome/zip.h', + 'test/chromedriver/chrome/zip_internal.cc', + 'test/chromedriver/chrome/zip_internal.h', + 'test/chromedriver/chrome/zip_reader.cc', + 'test/chromedriver/chrome/zip_reader.h', 'test/chromedriver/net/net_util.cc', 'test/chromedriver/net/net_util.h', 'test/chromedriver/net/sync_websocket.h', @@ -799,32 +797,6 @@ 'test/chromedriver/net/url_request_context_getter.h', 'test/chromedriver/net/websocket.cc', 'test/chromedriver/net/websocket.h', - 'test/chromedriver/session.cc', - 'test/chromedriver/session.h', - 'test/chromedriver/session_commands.cc', - 'test/chromedriver/session_commands.h', - 'test/chromedriver/session_map.h', - 'test/chromedriver/status.cc', - 'test/chromedriver/status.h', - 'test/chromedriver/synchronized_map.h', - 'test/chromedriver/ui_events.cc', - 'test/chromedriver/ui_events.h', - 'test/chromedriver/util.cc', - 'test/chromedriver/util.h', - 'test/chromedriver/version.cc', - 'test/chromedriver/version.h', - 'test/chromedriver/web_view_delegate.h', - 'test/chromedriver/web_view.h', - 'test/chromedriver/web_view_impl.cc', - 'test/chromedriver/web_view_impl.h', - 'test/chromedriver/window_commands.cc', - 'test/chromedriver/window_commands.h', - 'test/chromedriver/zip.cc', - 'test/chromedriver/zip.h', - 'test/chromedriver/zip_internal.cc', - 'test/chromedriver/zip_internal.h', - 'test/chromedriver/zip_reader.cc', - 'test/chromedriver/zip_reader.h', ], 'actions': [ { @@ -840,13 +812,13 @@ 'test/chromedriver/js/is_option_element_toggleable.js', ], 'outputs': [ - '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/js.cc', - '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/js.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.cc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.h', ], 'action': [ 'python', 'test/chromedriver/embed_js_in_cpp.py', '--directory', - '<(INTERMEDIATE_DIR)/chrome/test/chromedriver', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome', 'test/chromedriver/js/add_cookie.js', 'test/chromedriver/js/call_function.js', 'test/chromedriver/js/execute_async_script.js', @@ -861,19 +833,19 @@ 'inputs': [ 'test/chromedriver/cpp_source.py', 'test/chromedriver/embed_user_data_dir_in_cpp.py', - 'test/chromedriver/preferences.txt', - 'test/chromedriver/local_state.txt', + 'test/chromedriver/chrome/preferences.txt', + 'test/chromedriver/chrome/local_state.txt', ], 'outputs': [ - '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/user_data_dir.cc', - '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/user_data_dir.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.cc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h', ], 'action': [ 'python', 'test/chromedriver/embed_user_data_dir_in_cpp.py', '--directory', - '<(INTERMEDIATE_DIR)/chrome/test/chromedriver', - 'test/chromedriver/preferences.txt', - 'test/chromedriver/local_state.txt', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome', + 'test/chromedriver/chrome/preferences.txt', + 'test/chromedriver/chrome/local_state.txt', ], 'message': 'Generating sources for embedding user data dir in chromedriver', }, @@ -881,6 +853,58 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }, + { + 'target_name': 'chromedriver2_lib', + 'type': 'static_library', + 'dependencies': [ + 'chrome_devtools_lib', + '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../net/net.gyp:net', + '../ui/ui.gyp:ui', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + '../third_party/webdriver/atoms.cc', + '../third_party/webdriver/atoms.h', + 'test/chromedriver/basic_types.cc', + 'test/chromedriver/basic_types.h', + 'test/chromedriver/chromedriver.cc', + 'test/chromedriver/chromedriver.h', + 'test/chromedriver/command.h', + 'test/chromedriver/command_executor.h', + 'test/chromedriver/command_executor_impl.cc', + 'test/chromedriver/command_executor_impl.h', + 'test/chromedriver/command_names.cc', + 'test/chromedriver/command_names.h', + 'test/chromedriver/commands.cc', + 'test/chromedriver/commands.h', + 'test/chromedriver/element_commands.cc', + 'test/chromedriver/element_commands.h', + 'test/chromedriver/element_util.cc', + 'test/chromedriver/element_util.h', + 'test/chromedriver/key_converter.cc', + 'test/chromedriver/key_converter.h', + 'test/chromedriver/keycode_text_conversion.h', + 'test/chromedriver/keycode_text_conversion_mac.mm', + 'test/chromedriver/keycode_text_conversion_win.cc', + 'test/chromedriver/keycode_text_conversion_x.cc', + 'test/chromedriver/session.cc', + 'test/chromedriver/session.h', + 'test/chromedriver/session_commands.cc', + 'test/chromedriver/session_commands.h', + 'test/chromedriver/session_map.h', + 'test/chromedriver/synchronized_map.h', + 'test/chromedriver/util.cc', + 'test/chromedriver/util.h', + 'test/chromedriver/window_commands.cc', + 'test/chromedriver/window_commands.h', + ], + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], + }, # This is the new ChromeDriver based on DevTools. { 'target_name': 'chromedriver2', @@ -948,32 +972,32 @@ '../ui/ui.gyp:ui', ], 'sources': [ - 'test/chromedriver/chrome_desktop_impl_unittest.cc', - 'test/chromedriver/chrome_finder_unittest.cc', - 'test/chromedriver/chrome_impl_unittest.cc', + 'test/chromedriver/chrome/chrome_desktop_impl_unittest.cc', + 'test/chromedriver/chrome/chrome_finder_unittest.cc', + 'test/chromedriver/chrome/chrome_impl_unittest.cc', + 'test/chromedriver/chrome/devtools_client_impl_unittest.cc', + 'test/chromedriver/chrome/dom_tracker_unittest.cc', + 'test/chromedriver/chrome/frame_tracker_unittest.cc', + 'test/chromedriver/chrome/javascript_dialog_manager_unittest.cc', + 'test/chromedriver/chrome/navigation_tracker_unittest.cc', + 'test/chromedriver/chrome/status_unittest.cc', + 'test/chromedriver/chrome/stub_chrome.cc', + 'test/chromedriver/chrome/stub_chrome.h', + 'test/chromedriver/chrome/stub_devtools_client.cc', + 'test/chromedriver/chrome/stub_devtools_client.h', + 'test/chromedriver/chrome/stub_web_view.cc', + 'test/chromedriver/chrome/stub_web_view.h', + 'test/chromedriver/chrome/web_view_impl_unittest.cc', 'test/chromedriver/chromedriver_unittest.cc', 'test/chromedriver/command_executor_impl_unittest.cc', 'test/chromedriver/commands_unittest.cc', - 'test/chromedriver/devtools_client_impl_unittest.cc', - 'test/chromedriver/dom_tracker_unittest.cc', 'test/chromedriver/fake_session_accessor.cc', 'test/chromedriver/fake_session_accessor.h', - 'test/chromedriver/frame_tracker_unittest.cc', - 'test/chromedriver/javascript_dialog_manager_unittest.cc', - 'test/chromedriver/navigation_tracker_unittest.cc', 'test/chromedriver/server/http_handler_unittest.cc', 'test/chromedriver/server/http_response_unittest.cc', 'test/chromedriver/session_commands_unittest.cc', 'test/chromedriver/session_unittest.cc', - 'test/chromedriver/status_unittest.cc', - 'test/chromedriver/stub_chrome.cc', - 'test/chromedriver/stub_chrome.h', - 'test/chromedriver/stub_devtools_client.cc', - 'test/chromedriver/stub_devtools_client.h', - 'test/chromedriver/stub_web_view.cc', - 'test/chromedriver/stub_web_view.h', 'test/chromedriver/synchronized_map_unittest.cc', - 'test/chromedriver/web_view_impl_unittest.cc', ], }, # ChromeDriver2 tests that aren't run on the main buildbot. Available diff --git a/chrome/test/chromedriver/README.txt b/chrome/test/chromedriver/README.txt index 893777c..2695681 100644 --- a/chrome/test/chromedriver/README.txt +++ b/chrome/test/chromedriver/README.txt @@ -37,6 +37,30 @@ ChromeDriver is also available as a standalone server executable which communicates via the WebDriver JSON wire protocol. This can be used with the open source WebDriver client libraries. +=====Code structure===== +Code under the 'chrome' subdirectory is intended to be unaware of WebDriver and +serve as a basic C++ interface for controlling Chrome remotely via DevTools. +As such, it should not have any WebDriver-related dependencies. + +1) chrome/test/chromedriver +Implements chromedriver commands. + +2) chrome/test/chromedriver/chrome +Code to deal with chrome specific stuff, like starting Chrome on different OS +platforms, controlling Chrome via DevTools, handling events from DevTools, etc. + +3) chrome/test/chromedriver/js +Javascript helper scripts. + +4) chrome/test/chromedriver/net +Code to deal with network communication, such as connection to DevTools. + +5) chrome/test/chromedriver/server +Code for the chromedriver server. + +6) chrome/test/chromedriver/third_party +Third party libraries used by chromedriver. + =====Testing===== There are 4 test suites for verifying ChromeDriver's correctness: @@ -61,6 +85,6 @@ See http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/webdriver =====Contributing===== Find an open issue and submit a patch for review by an individual listed in -the OWNERS file in this directory. Issues are tracked in chromium's issue -tracker with Feature=WebDriver: - https://code.google.com/p/chromium/issues/list?q=feature%3Dwebdriver +the OWNERS file in this directory. Issues are tracked in chromedriver's issue +tracker: + https://code.google.com/p/chromedriver/issues/list diff --git a/chrome/test/chromedriver/adb_commands.py b/chrome/test/chromedriver/chrome/adb_commands.py index 583631b..583631b 100755 --- a/chrome/test/chromedriver/adb_commands.py +++ b/chrome/test/chromedriver/chrome/adb_commands.py diff --git a/chrome/test/chromedriver/chrome.h b/chrome/test/chromedriver/chrome/chrome.h index 915828f..85ac7fa 100644 --- a/chrome/test/chromedriver/chrome.h +++ b/chrome/test/chromedriver/chrome/chrome.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_H_ -#define CHROME_TEST_CHROMEDRIVER_CHROME_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_H_ #include <list> #include <string> @@ -37,4 +37,4 @@ class Chrome { virtual Status Quit() = 0; }; -#endif // CHROME_TEST_CHROMEDRIVER_CHROME_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_H_ diff --git a/chrome/test/chromedriver/chrome_android_impl.cc b/chrome/test/chromedriver/chrome/chrome_android_impl.cc index 4c9ea6f..c467eb7 100644 --- a/chrome/test/chromedriver/chrome_android_impl.cc +++ b/chrome/test/chromedriver/chrome/chrome_android_impl.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/chrome_android_impl.h" +#include "chrome/test/chromedriver/chrome/chrome_android_impl.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/process_util.h" #include "base/string_number_conversions.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/web_view.h" #include "chrome/test/chromedriver/net/sync_websocket_impl.h" #include "chrome/test/chromedriver/net/url_request_context_getter.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/web_view.h" ChromeAndroidImpl::ChromeAndroidImpl( URLRequestContextGetter* context_getter, diff --git a/chrome/test/chromedriver/chrome_android_impl.h b/chrome/test/chromedriver/chrome/chrome_android_impl.h index 2e447c3..3c89ca5 100644 --- a/chrome/test/chromedriver/chrome_android_impl.h +++ b/chrome/test/chromedriver/chrome/chrome_android_impl.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_ANDROID_IMPL_H_ -#define CHROME_TEST_CHROMEDRIVER_CHROME_ANDROID_IMPL_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_ANDROID_IMPL_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_ANDROID_IMPL_H_ #include "base/compiler_specific.h" #include "base/files/scoped_temp_dir.h" #include "base/process.h" -#include "chrome/test/chromedriver/chrome_impl.h" +#include "chrome/test/chromedriver/chrome/chrome_impl.h" #include "chrome/test/chromedriver/net/sync_websocket_factory.h" class Status; @@ -30,4 +30,4 @@ class ChromeAndroidImpl : public ChromeImpl { virtual Status Quit() OVERRIDE; }; -#endif // CHROME_TEST_CHROMEDRIVER_CHROME_ANDROID_IMPL_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_ANDROID_IMPL_H_ diff --git a/chrome/test/chromedriver/chrome_desktop_impl.cc b/chrome/test/chromedriver/chrome/chrome_desktop_impl.cc index 42488b3..f94a957 100644 --- a/chrome/test/chromedriver/chrome_desktop_impl.cc +++ b/chrome/test/chromedriver/chrome/chrome_desktop_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/chrome_desktop_impl.h" +#include "chrome/test/chromedriver/chrome/chrome_desktop_impl.h" #include "base/base64.h" #include "base/command_line.h" @@ -19,12 +19,12 @@ #include "base/sys_info.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/zip.h" -#include "chrome/test/chromedriver/chrome_finder.h" +#include "chrome/test/chromedriver/chrome/chrome_finder.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/user_data_dir.h" +#include "chrome/test/chromedriver/chrome/zip.h" #include "chrome/test/chromedriver/net/sync_websocket_impl.h" #include "chrome/test/chromedriver/net/url_request_context_getter.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/user_data_dir.h" ChromeDesktopImpl::ChromeDesktopImpl( URLRequestContextGetter* context_getter, diff --git a/chrome/test/chromedriver/chrome_desktop_impl.h b/chrome/test/chromedriver/chrome/chrome_desktop_impl.h index 8171599..acef1a0 100644 --- a/chrome/test/chromedriver/chrome_desktop_impl.h +++ b/chrome/test/chromedriver/chrome/chrome_desktop_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_DESKTOP_IMPL_H_ -#define CHROME_TEST_CHROMEDRIVER_CHROME_DESKTOP_IMPL_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ #include <string> @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/process.h" -#include "chrome/test/chromedriver/chrome_impl.h" +#include "chrome/test/chromedriver/chrome/chrome_impl.h" #include "chrome/test/chromedriver/net/sync_websocket_factory.h" class CommandLine; @@ -61,4 +61,4 @@ Status PrepareUserDataDir( const base::DictionaryValue* custom_local_state); } // namespace internal -#endif // CHROME_TEST_CHROMEDRIVER_CHROME_DESKTOP_IMPL_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ diff --git a/chrome/test/chromedriver/chrome_desktop_impl_unittest.cc b/chrome/test/chromedriver/chrome/chrome_desktop_impl_unittest.cc index ef31886..23d8b55 100644 --- a/chrome/test/chromedriver/chrome_desktop_impl_unittest.cc +++ b/chrome/test/chromedriver/chrome/chrome_desktop_impl_unittest.cc @@ -10,8 +10,8 @@ #include "base/path_service.h" #include "base/strings/string_split.h" #include "base/values.h" -#include "chrome/test/chromedriver/chrome_desktop_impl.h" -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/chrome_desktop_impl.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "testing/gtest/include/gtest/gtest.h" TEST(ProcessCommandLineArgs, NoArgs) { diff --git a/chrome/test/chromedriver/chrome_finder.cc b/chrome/test/chromedriver/chrome/chrome_finder.cc index 4a6e420..a69924e 100644 --- a/chrome/test/chromedriver/chrome_finder.cc +++ b/chrome/test/chromedriver/chrome/chrome_finder.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/chrome_finder.h" +#include "chrome/test/chromedriver/chrome/chrome_finder.h" #include <string> #include <vector> diff --git a/chrome/test/chromedriver/chrome_finder.h b/chrome/test/chromedriver/chrome/chrome_finder.h index 0e7ca90..c68186a8 100644 --- a/chrome/test/chromedriver/chrome_finder.h +++ b/chrome/test/chromedriver/chrome/chrome_finder.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_FINDER_H_ -#define CHROME_TEST_CHROMEDRIVER_CHROME_FINDER_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_FINDER_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_FINDER_H_ #include <vector> @@ -26,4 +26,4 @@ bool FindExe( } // namespace internal -#endif // CHROME_TEST_CHROMEDRIVER_CHROME_FINDER_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_FINDER_H_ diff --git a/chrome/test/chromedriver/chrome_finder_mac.mm b/chrome/test/chromedriver/chrome/chrome_finder_mac.mm index f2fe490..f2fe490 100644 --- a/chrome/test/chromedriver/chrome_finder_mac.mm +++ b/chrome/test/chromedriver/chrome/chrome_finder_mac.mm diff --git a/chrome/test/chromedriver/chrome_finder_unittest.cc b/chrome/test/chromedriver/chrome/chrome_finder_unittest.cc index 7815c7e..584fe92 100644 --- a/chrome/test/chromedriver/chrome_finder_unittest.cc +++ b/chrome/test/chromedriver/chrome/chrome_finder_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/files/file_path.h" -#include "chrome/test/chromedriver/chrome_finder.h" +#include "chrome/test/chromedriver/chrome/chrome_finder.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/test/chromedriver/chrome_impl.cc b/chrome/test/chromedriver/chrome/chrome_impl.cc index bf337b0..5665d49 100644 --- a/chrome/test/chromedriver/chrome_impl.cc +++ b/chrome/test/chromedriver/chrome/chrome_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/chrome_impl.h" +#include "chrome/test/chromedriver/chrome/chrome_impl.h" #include <algorithm> #include <list> @@ -15,14 +15,14 @@ #include "base/threading/platform_thread.h" #include "base/time.h" #include "base/values.h" -#include "chrome/test/chromedriver/devtools_client_impl.h" -#include "chrome/test/chromedriver/javascript_dialog_manager.h" +#include "chrome/test/chromedriver/chrome/devtools_client_impl.h" +#include "chrome/test/chromedriver/chrome/javascript_dialog_manager.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/version.h" +#include "chrome/test/chromedriver/chrome/web_view_impl.h" #include "chrome/test/chromedriver/net/net_util.h" #include "chrome/test/chromedriver/net/sync_websocket_impl.h" #include "chrome/test/chromedriver/net/url_request_context_getter.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/version.h" -#include "chrome/test/chromedriver/web_view_impl.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/test/chromedriver/chrome_impl.h b/chrome/test/chromedriver/chrome/chrome_impl.h index 6f59450..eb4bcdf 100644 --- a/chrome/test/chromedriver/chrome_impl.h +++ b/chrome/test/chromedriver/chrome/chrome_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_IMPL_H_ -#define CHROME_TEST_CHROMEDRIVER_CHROME_IMPL_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_ #include <list> #include <map> @@ -12,9 +12,9 @@ #include "base/compiler_specific.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" -#include "chrome/test/chromedriver/chrome.h" +#include "chrome/test/chromedriver/chrome/chrome.h" +#include "chrome/test/chromedriver/chrome/web_view_delegate.h" #include "chrome/test/chromedriver/net/sync_websocket_factory.h" -#include "chrome/test/chromedriver/web_view_delegate.h" class JavaScriptDialogManager; class Status; @@ -88,4 +88,4 @@ Status ParseVersionInfo(const std::string& data, } // namespace internal -#endif // CHROME_TEST_CHROMEDRIVER_CHROME_IMPL_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_ diff --git a/chrome/test/chromedriver/chrome_impl_unittest.cc b/chrome/test/chromedriver/chrome/chrome_impl_unittest.cc index e17b3cb..9e859ae 100644 --- a/chrome/test/chromedriver/chrome_impl_unittest.cc +++ b/chrome/test/chromedriver/chrome/chrome_impl_unittest.cc @@ -8,9 +8,9 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/test/chromedriver/chrome_impl.h" -#include "chrome/test/chromedriver/devtools_client.h" -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/chrome_impl.h" +#include "chrome/test/chromedriver/chrome/devtools_client.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/test/chromedriver/devtools_client.cc b/chrome/test/chromedriver/chrome/devtools_client.cc index 54c559a..0257cba 100644 --- a/chrome/test/chromedriver/devtools_client.cc +++ b/chrome/test/chromedriver/chrome/devtools_client.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/devtools_client.h" +#include "chrome/test/chromedriver/chrome/devtools_client.h" #include "base/bind.h" #include "base/values.h" -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/status.h" namespace { diff --git a/chrome/test/chromedriver/devtools_client.h b/chrome/test/chromedriver/chrome/devtools_client.h index d5e838f..a87a161 100644 --- a/chrome/test/chromedriver/devtools_client.h +++ b/chrome/test/chromedriver/chrome/devtools_client.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_DEVTOOLS_CLIENT_H_ -#define CHROME_TEST_CHROMEDRIVER_DEVTOOLS_CLIENT_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_DEVTOOLS_CLIENT_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_DEVTOOLS_CLIENT_H_ #include <string> @@ -45,4 +45,4 @@ class DevToolsClient { virtual Status HandleReceivedEvents(); }; -#endif // CHROME_TEST_CHROMEDRIVER_DEVTOOLS_CLIENT_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_DEVTOOLS_CLIENT_H_ diff --git a/chrome/test/chromedriver/devtools_client_impl.cc b/chrome/test/chromedriver/chrome/devtools_client_impl.cc index 5e91f8a..359288c 100644 --- a/chrome/test/chromedriver/devtools_client_impl.cc +++ b/chrome/test/chromedriver/chrome/devtools_client_impl.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/devtools_client_impl.h" +#include "chrome/test/chromedriver/chrome/devtools_client_impl.h" #include "base/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/values.h" -#include "chrome/test/chromedriver/devtools_event_listener.h" +#include "chrome/test/chromedriver/chrome/devtools_event_listener.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/net/sync_websocket.h" #include "chrome/test/chromedriver/net/url_request_context_getter.h" -#include "chrome/test/chromedriver/status.h" namespace { diff --git a/chrome/test/chromedriver/devtools_client_impl.h b/chrome/test/chromedriver/chrome/devtools_client_impl.h index ccdf281..80a3815 100644 --- a/chrome/test/chromedriver/devtools_client_impl.h +++ b/chrome/test/chromedriver/chrome/devtools_client_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_DEVTOOLS_CLIENT_IMPL_H_ -#define CHROME_TEST_CHROMEDRIVER_DEVTOOLS_CLIENT_IMPL_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_DEVTOOLS_CLIENT_IMPL_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_DEVTOOLS_CLIENT_IMPL_H_ #include <list> #include <map> @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "chrome/test/chromedriver/devtools_client.h" +#include "chrome/test/chromedriver/chrome/devtools_client.h" #include "chrome/test/chromedriver/net/sync_websocket_factory.h" #include "googleurl/src/gurl.h" @@ -124,4 +124,4 @@ bool ParseInspectorMessage( } // namespace internal -#endif // CHROME_TEST_CHROMEDRIVER_DEVTOOLS_CLIENT_IMPL_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_DEVTOOLS_CLIENT_IMPL_H_ diff --git a/chrome/test/chromedriver/devtools_client_impl_unittest.cc b/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc index f9d30dc..f18529f 100644 --- a/chrome/test/chromedriver/devtools_client_impl_unittest.cc +++ b/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc @@ -11,11 +11,11 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/test/chromedriver/devtools_client_impl.h" -#include "chrome/test/chromedriver/devtools_event_listener.h" +#include "chrome/test/chromedriver/chrome/devtools_client_impl.h" +#include "chrome/test/chromedriver/chrome/devtools_event_listener.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/net/sync_websocket.h" #include "chrome/test/chromedriver/net/sync_websocket_factory.h" -#include "chrome/test/chromedriver/status.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/chromedriver/devtools_event_listener.h b/chrome/test/chromedriver/chrome/devtools_event_listener.h index 31919bc..c3ff730 100644 --- a/chrome/test/chromedriver/devtools_event_listener.h +++ b/chrome/test/chromedriver/chrome/devtools_event_listener.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_DEVTOOLS_EVENT_LISTENER_H_ -#define CHROME_TEST_CHROMEDRIVER_DEVTOOLS_EVENT_LISTENER_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_DEVTOOLS_EVENT_LISTENER_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_DEVTOOLS_EVENT_LISTENER_H_ #include <string> @@ -24,4 +24,4 @@ class DevToolsEventListener { const base::DictionaryValue& params) = 0; }; -#endif // CHROME_TEST_CHROMEDRIVER_DEVTOOLS_EVENT_LISTENER_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_DEVTOOLS_EVENT_LISTENER_H_ diff --git a/chrome/test/chromedriver/dom_tracker.cc b/chrome/test/chromedriver/chrome/dom_tracker.cc index e91d925..bf93779 100644 --- a/chrome/test/chromedriver/dom_tracker.cc +++ b/chrome/test/chromedriver/chrome/dom_tracker.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/dom_tracker.h" +#include "chrome/test/chromedriver/chrome/dom_tracker.h" #include <utility> #include "base/json/json_writer.h" #include "base/logging.h" #include "base/values.h" -#include "chrome/test/chromedriver/devtools_client.h" -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/devtools_client.h" +#include "chrome/test/chromedriver/chrome/status.h" DomTracker::DomTracker(DevToolsClient* client) : client_(client) { DCHECK(client_); diff --git a/chrome/test/chromedriver/dom_tracker.h b/chrome/test/chromedriver/chrome/dom_tracker.h index 1173a08..e1611a3 100644 --- a/chrome/test/chromedriver/dom_tracker.h +++ b/chrome/test/chromedriver/chrome/dom_tracker.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_DOM_TRACKER_H_ -#define CHROME_TEST_CHROMEDRIVER_DOM_TRACKER_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_DOM_TRACKER_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_DOM_TRACKER_H_ #include <map> #include <string> #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/test/chromedriver/devtools_event_listener.h" +#include "chrome/test/chromedriver/chrome/devtools_event_listener.h" namespace base { class DictionaryValue; @@ -43,4 +43,4 @@ class DomTracker : public DevToolsEventListener { DISALLOW_COPY_AND_ASSIGN(DomTracker); }; -#endif // CHROME_TEST_CHROMEDRIVER_DOM_TRACKER_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_DOM_TRACKER_H_ diff --git a/chrome/test/chromedriver/dom_tracker_unittest.cc b/chrome/test/chromedriver/chrome/dom_tracker_unittest.cc index bdc7ec3..8a38e7f 100644 --- a/chrome/test/chromedriver/dom_tracker_unittest.cc +++ b/chrome/test/chromedriver/chrome/dom_tracker_unittest.cc @@ -7,9 +7,9 @@ #include "base/json/json_reader.h" #include "base/values.h" -#include "chrome/test/chromedriver/dom_tracker.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/stub_devtools_client.h" +#include "chrome/test/chromedriver/chrome/dom_tracker.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/stub_devtools_client.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/test/chromedriver/frame_tracker.cc b/chrome/test/chromedriver/chrome/frame_tracker.cc index 455d922..6404097 100644 --- a/chrome/test/chromedriver/frame_tracker.cc +++ b/chrome/test/chromedriver/chrome/frame_tracker.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/frame_tracker.h" +#include "chrome/test/chromedriver/chrome/frame_tracker.h" #include <utility> #include "base/json/json_writer.h" #include "base/logging.h" #include "base/values.h" -#include "chrome/test/chromedriver/devtools_client.h" -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/devtools_client.h" +#include "chrome/test/chromedriver/chrome/status.h" FrameTracker::FrameTracker(DevToolsClient* client) : client_(client) { DCHECK(client_); diff --git a/chrome/test/chromedriver/frame_tracker.h b/chrome/test/chromedriver/chrome/frame_tracker.h index dfa8eeb..32e9471 100644 --- a/chrome/test/chromedriver/frame_tracker.h +++ b/chrome/test/chromedriver/chrome/frame_tracker.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_FRAME_TRACKER_H_ -#define CHROME_TEST_CHROMEDRIVER_FRAME_TRACKER_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_FRAME_TRACKER_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_FRAME_TRACKER_H_ #include <map> #include <string> #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/test/chromedriver/devtools_event_listener.h" +#include "chrome/test/chromedriver/chrome/devtools_event_listener.h" namespace base { class DictionaryValue; @@ -42,4 +42,4 @@ class FrameTracker : public DevToolsEventListener { DISALLOW_COPY_AND_ASSIGN(FrameTracker); }; -#endif // CHROME_TEST_CHROMEDRIVER_FRAME_TRACKER_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_FRAME_TRACKER_H_ diff --git a/chrome/test/chromedriver/frame_tracker_unittest.cc b/chrome/test/chromedriver/chrome/frame_tracker_unittest.cc index 8f5d196..69b6033 100644 --- a/chrome/test/chromedriver/frame_tracker_unittest.cc +++ b/chrome/test/chromedriver/chrome/frame_tracker_unittest.cc @@ -6,9 +6,9 @@ #include "base/json/json_reader.h" #include "base/values.h" -#include "chrome/test/chromedriver/frame_tracker.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/stub_devtools_client.h" +#include "chrome/test/chromedriver/chrome/frame_tracker.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/stub_devtools_client.h" #include "testing/gtest/include/gtest/gtest.h" TEST(FrameTracker, GetContextIdForFrame) { diff --git a/chrome/test/chromedriver/javascript_dialog_manager.cc b/chrome/test/chromedriver/chrome/javascript_dialog_manager.cc index ed8aa70..a8eb7cd 100644 --- a/chrome/test/chromedriver/javascript_dialog_manager.cc +++ b/chrome/test/chromedriver/chrome/javascript_dialog_manager.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/javascript_dialog_manager.h" +#include "chrome/test/chromedriver/chrome/javascript_dialog_manager.h" #include "base/logging.h" #include "base/values.h" -#include "chrome/test/chromedriver/devtools_client.h" -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/devtools_client.h" +#include "chrome/test/chromedriver/chrome/status.h" JavaScriptDialogManager::JavaScriptDialogManager(DevToolsClient* client) : client_(client) { diff --git a/chrome/test/chromedriver/javascript_dialog_manager.h b/chrome/test/chromedriver/chrome/javascript_dialog_manager.h index a5684c6..fbc8329 100644 --- a/chrome/test/chromedriver/javascript_dialog_manager.h +++ b/chrome/test/chromedriver/chrome/javascript_dialog_manager.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_JAVASCRIPT_DIALOG_MANAGER_H_ -#define CHROME_TEST_CHROMEDRIVER_JAVASCRIPT_DIALOG_MANAGER_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_JAVASCRIPT_DIALOG_MANAGER_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_JAVASCRIPT_DIALOG_MANAGER_H_ #include <list> #include <string> #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/test/chromedriver/devtools_event_listener.h" +#include "chrome/test/chromedriver/chrome/devtools_event_listener.h" namespace base { class DictionaryValue; @@ -47,4 +47,4 @@ class JavaScriptDialogManager : public DevToolsEventListener { DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManager); }; -#endif // CHROME_TEST_CHROMEDRIVER_JAVASCRIPT_DIALOG_MANAGER_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_JAVASCRIPT_DIALOG_MANAGER_H_ diff --git a/chrome/test/chromedriver/javascript_dialog_manager_unittest.cc b/chrome/test/chromedriver/chrome/javascript_dialog_manager_unittest.cc index b990deb..fcc3dce 100644 --- a/chrome/test/chromedriver/javascript_dialog_manager_unittest.cc +++ b/chrome/test/chromedriver/chrome/javascript_dialog_manager_unittest.cc @@ -7,9 +7,9 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/test/chromedriver/javascript_dialog_manager.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/stub_devtools_client.h" +#include "chrome/test/chromedriver/chrome/javascript_dialog_manager.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/stub_devtools_client.h" #include "testing/gtest/include/gtest/gtest.h" TEST(JavaScriptDialogManager, NoDialog) { diff --git a/chrome/test/chromedriver/local_state.txt b/chrome/test/chromedriver/chrome/local_state.txt index 75b3067..75b3067 100644 --- a/chrome/test/chromedriver/local_state.txt +++ b/chrome/test/chromedriver/chrome/local_state.txt diff --git a/chrome/test/chromedriver/navigation_tracker.cc b/chrome/test/chromedriver/chrome/navigation_tracker.cc index c915eb8..1553ac4 100644 --- a/chrome/test/chromedriver/navigation_tracker.cc +++ b/chrome/test/chromedriver/chrome/navigation_tracker.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/navigation_tracker.h" +#include "chrome/test/chromedriver/chrome/navigation_tracker.h" #include "base/logging.h" #include "base/stringprintf.h" #include "base/values.h" -#include "chrome/test/chromedriver/devtools_client.h" -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/devtools_client.h" +#include "chrome/test/chromedriver/chrome/status.h" NavigationTracker::NavigationTracker(DevToolsClient* client) : client_(client), diff --git a/chrome/test/chromedriver/navigation_tracker.h b/chrome/test/chromedriver/chrome/navigation_tracker.h index da5f4b8..2664a64 100644 --- a/chrome/test/chromedriver/navigation_tracker.h +++ b/chrome/test/chromedriver/chrome/navigation_tracker.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_NAVIGATION_TRACKER_H_ -#define CHROME_TEST_CHROMEDRIVER_NAVIGATION_TRACKER_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_NAVIGATION_TRACKER_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_NAVIGATION_TRACKER_H_ #include <set> #include <string> #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/test/chromedriver/devtools_event_listener.h" -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/devtools_event_listener.h" +#include "chrome/test/chromedriver/chrome/status.h" namespace base { class DictionaryValue; @@ -48,4 +48,4 @@ class NavigationTracker : public DevToolsEventListener { DISALLOW_COPY_AND_ASSIGN(NavigationTracker); }; -#endif // CHROME_TEST_CHROMEDRIVER_NAVIGATION_TRACKER_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_NAVIGATION_TRACKER_H_ diff --git a/chrome/test/chromedriver/navigation_tracker_unittest.cc b/chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc index 6c73ab6..79cc0f6 100644 --- a/chrome/test/chromedriver/navigation_tracker_unittest.cc +++ b/chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc @@ -7,9 +7,9 @@ #include "base/compiler_specific.h" #include "base/json/json_reader.h" #include "base/values.h" -#include "chrome/test/chromedriver/navigation_tracker.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/stub_devtools_client.h" +#include "chrome/test/chromedriver/chrome/navigation_tracker.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/stub_devtools_client.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/test/chromedriver/preferences.txt b/chrome/test/chromedriver/chrome/preferences.txt index 32f4cb1..32f4cb1 100644 --- a/chrome/test/chromedriver/preferences.txt +++ b/chrome/test/chromedriver/chrome/preferences.txt diff --git a/chrome/test/chromedriver/status.cc b/chrome/test/chromedriver/chrome/status.cc index c6bd216..b71aeb9 100644 --- a/chrome/test/chromedriver/status.cc +++ b/chrome/test/chromedriver/chrome/status.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "base/stringprintf.h" diff --git a/chrome/test/chromedriver/status.h b/chrome/test/chromedriver/chrome/status.h index 3ba7ee5..a3ae68f 100644 --- a/chrome/test/chromedriver/status.h +++ b/chrome/test/chromedriver/chrome/status.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_STATUS_H_ -#define CHROME_TEST_CHROMEDRIVER_STATUS_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_STATUS_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_STATUS_H_ #include <string> @@ -55,4 +55,4 @@ class Status { std::string msg_; }; -#endif // CHROME_TEST_CHROMEDRIVER_STATUS_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_STATUS_H_ diff --git a/chrome/test/chromedriver/status_unittest.cc b/chrome/test/chromedriver/chrome/status_unittest.cc index a207d12..2d116cb 100644 --- a/chrome/test/chromedriver/status_unittest.cc +++ b/chrome/test/chromedriver/chrome/status_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "testing/gtest/include/gtest/gtest.h" TEST(StatusTest, Ok) { diff --git a/chrome/test/chromedriver/stub_chrome.cc b/chrome/test/chromedriver/chrome/stub_chrome.cc index 034d2f6..f430f92 100644 --- a/chrome/test/chromedriver/stub_chrome.cc +++ b/chrome/test/chromedriver/chrome/stub_chrome.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/stub_chrome.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/web_view.h" +#include "chrome/test/chromedriver/chrome/stub_chrome.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/web_view.h" StubChrome::StubChrome() {} diff --git a/chrome/test/chromedriver/stub_chrome.h b/chrome/test/chromedriver/chrome/stub_chrome.h index 7e49e2d..3f9475a 100644 --- a/chrome/test/chromedriver/stub_chrome.h +++ b/chrome/test/chromedriver/chrome/stub_chrome.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_STUB_CHROME_H_ -#define CHROME_TEST_CHROMEDRIVER_STUB_CHROME_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_STUB_CHROME_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_STUB_CHROME_H_ #include <list> #include "base/compiler_specific.h" -#include "chrome/test/chromedriver/chrome.h" +#include "chrome/test/chromedriver/chrome/chrome.h" class Status; class WebView; @@ -30,4 +30,4 @@ class StubChrome : public Chrome { virtual Status Quit() OVERRIDE; }; -#endif // CHROME_TEST_CHROMEDRIVER_STUB_CHROME_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_STUB_CHROME_H_ diff --git a/chrome/test/chromedriver/stub_devtools_client.cc b/chrome/test/chromedriver/chrome/stub_devtools_client.cc index 64f643a..629ff29 100644 --- a/chrome/test/chromedriver/stub_devtools_client.cc +++ b/chrome/test/chromedriver/chrome/stub_devtools_client.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/stub_devtools_client.h" +#include "chrome/test/chromedriver/chrome/stub_devtools_client.h" #include "base/values.h" -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/status.h" StubDevToolsClient::StubDevToolsClient() {} diff --git a/chrome/test/chromedriver/stub_devtools_client.h b/chrome/test/chromedriver/chrome/stub_devtools_client.h index 306d2d7..0c3457a 100644 --- a/chrome/test/chromedriver/stub_devtools_client.h +++ b/chrome/test/chromedriver/chrome/stub_devtools_client.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_STUB_DEVTOOLS_CLIENT_H_ -#define CHROME_TEST_CHROMEDRIVER_STUB_DEVTOOLS_CLIENT_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_STUB_DEVTOOLS_CLIENT_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_STUB_DEVTOOLS_CLIENT_H_ #include <list> #include <string> #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "chrome/test/chromedriver/devtools_client.h" +#include "chrome/test/chromedriver/chrome/devtools_client.h" namespace base { class DictionaryValue; @@ -39,4 +39,4 @@ class StubDevToolsClient : public DevToolsClient { std::list<DevToolsEventListener*> listeners_; }; -#endif // CHROME_TEST_CHROMEDRIVER_STUB_DEVTOOLS_CLIENT_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_STUB_DEVTOOLS_CLIENT_H_ diff --git a/chrome/test/chromedriver/stub_web_view.cc b/chrome/test/chromedriver/chrome/stub_web_view.cc index 07d9c94..a241382 100644 --- a/chrome/test/chromedriver/stub_web_view.cc +++ b/chrome/test/chromedriver/chrome/stub_web_view.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/values.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/stub_web_view.h" -#include "chrome/test/chromedriver/ui_events.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/stub_web_view.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" StubWebView::StubWebView(const std::string& id) : id_(id) {} diff --git a/chrome/test/chromedriver/stub_web_view.h b/chrome/test/chromedriver/chrome/stub_web_view.h index c4f245e..c4ac5bc 100644 --- a/chrome/test/chromedriver/stub_web_view.h +++ b/chrome/test/chromedriver/chrome/stub_web_view.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_STUB_WEB_VIEW_H_ -#define CHROME_TEST_CHROMEDRIVER_STUB_WEB_VIEW_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_STUB_WEB_VIEW_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_STUB_WEB_VIEW_H_ #include <list> #include <string> #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "chrome/test/chromedriver/web_view.h" +#include "chrome/test/chromedriver/chrome/web_view.h" namespace base { class ListValue; @@ -61,4 +61,4 @@ class StubWebView : public WebView { std::string id_; }; -#endif // CHROME_TEST_CHROMEDRIVER_STUB_WEB_VIEW_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_STUB_WEB_VIEW_H_ diff --git a/chrome/test/chromedriver/ui_events.cc b/chrome/test/chromedriver/chrome/ui_events.cc index 05c5eb5..7ca2817 100644 --- a/chrome/test/chromedriver/ui_events.cc +++ b/chrome/test/chromedriver/chrome/ui_events.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/ui_events.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" MouseEvent::MouseEvent(MouseEventType type, MouseButton button, diff --git a/chrome/test/chromedriver/ui_events.h b/chrome/test/chromedriver/chrome/ui_events.h index 99e5cb1..44fa067 100644 --- a/chrome/test/chromedriver/ui_events.h +++ b/chrome/test/chromedriver/chrome/ui_events.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_UI_EVENTS_H_ -#define CHROME_TEST_CHROMEDRIVER_UI_EVENTS_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_UI_EVENTS_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_UI_EVENTS_H_ #include <string> @@ -75,4 +75,4 @@ struct KeyEvent { ui::KeyboardCode key_code; }; -#endif // CHROME_TEST_CHROMEDRIVER_UI_EVENTS_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_UI_EVENTS_H_ diff --git a/chrome/test/chromedriver/version.cc b/chrome/test/chromedriver/chrome/version.cc index 0c6fa87..9b28e69 100644 --- a/chrome/test/chromedriver/version.cc +++ b/chrome/test/chromedriver/chrome/version.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/version.h" +#include "chrome/test/chromedriver/chrome/version.h" #include "base/stringprintf.h" diff --git a/chrome/test/chromedriver/version.h b/chrome/test/chromedriver/chrome/version.h index 8276166..0422ea2 100644 --- a/chrome/test/chromedriver/version.h +++ b/chrome/test/chromedriver/chrome/version.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_VERSION_H_ -#define CHROME_TEST_CHROMEDRIVER_VERSION_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_VERSION_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_VERSION_H_ #include <string> @@ -12,4 +12,4 @@ extern const int kMinimumSupportedChromeBuildNo; std::string GetMinimumSupportedChromeVersion(); -#endif // CHROME_TEST_CHROMEDRIVER_VERSION_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_VERSION_H_ diff --git a/chrome/test/chromedriver/web_view.h b/chrome/test/chromedriver/chrome/web_view.h index 8568e67..e4b9620 100644 --- a/chrome/test/chromedriver/web_view.h +++ b/chrome/test/chromedriver/chrome/web_view.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_WEB_VIEW_H_ -#define CHROME_TEST_CHROMEDRIVER_WEB_VIEW_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_H_ #include <list> #include <string> @@ -96,4 +96,4 @@ class WebView { virtual Status CaptureScreenshot(std::string* screenshot) = 0; }; -#endif // CHROME_TEST_CHROMEDRIVER_WEB_VIEW_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_H_ diff --git a/chrome/test/chromedriver/web_view_delegate.h b/chrome/test/chromedriver/chrome/web_view_delegate.h index fdf5906..bdd96f7 100644 --- a/chrome/test/chromedriver/web_view_delegate.h +++ b/chrome/test/chromedriver/chrome/web_view_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_WEB_VIEW_DELEGATE_H_ -#define CHROME_TEST_CHROMEDRIVER_WEB_VIEW_DELEGATE_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_DELEGATE_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_DELEGATE_H_ class WebView; @@ -15,4 +15,4 @@ class WebViewDelegate { virtual void OnWebViewClose(WebView* web_view) = 0; }; -#endif // CHROME_TEST_CHROMEDRIVER_WEB_VIEW_DELEGATE_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_DELEGATE_H_ diff --git a/chrome/test/chromedriver/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc index 30db91b..76169cd 100644 --- a/chrome/test/chromedriver/web_view_impl.cc +++ b/chrome/test/chromedriver/chrome/web_view_impl.cc @@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/web_view_impl.h" +#include "chrome/test/chromedriver/chrome/web_view_impl.h" #include "base/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/stringprintf.h" #include "base/values.h" -#include "chrome/test/chromedriver/devtools_client_impl.h" -#include "chrome/test/chromedriver/dom_tracker.h" -#include "chrome/test/chromedriver/frame_tracker.h" -#include "chrome/test/chromedriver/javascript_dialog_manager.h" -#include "chrome/test/chromedriver/js.h" -#include "chrome/test/chromedriver/navigation_tracker.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/ui_events.h" -#include "chrome/test/chromedriver/web_view_delegate.h" +#include "chrome/test/chromedriver/chrome/devtools_client_impl.h" +#include "chrome/test/chromedriver/chrome/dom_tracker.h" +#include "chrome/test/chromedriver/chrome/frame_tracker.h" +#include "chrome/test/chromedriver/chrome/javascript_dialog_manager.h" +#include "chrome/test/chromedriver/chrome/js.h" +#include "chrome/test/chromedriver/chrome/navigation_tracker.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" +#include "chrome/test/chromedriver/chrome/web_view_delegate.h" namespace { diff --git a/chrome/test/chromedriver/web_view_impl.h b/chrome/test/chromedriver/chrome/web_view_impl.h index 5cdc82f..903e349 100644 --- a/chrome/test/chromedriver/web_view_impl.h +++ b/chrome/test/chromedriver/chrome/web_view_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_WEB_VIEW_IMPL_H_ -#define CHROME_TEST_CHROMEDRIVER_WEB_VIEW_IMPL_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_ #include <list> #include <string> @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "chrome/test/chromedriver/web_view.h" +#include "chrome/test/chromedriver/chrome/web_view.h" namespace base { class DictionaryValue; @@ -109,4 +109,4 @@ Status GetNodeIdFromFunction(DevToolsClient* client, } // namespace internal -#endif // CHROME_TEST_CHROMEDRIVER_WEB_VIEW_IMPL_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_ diff --git a/chrome/test/chromedriver/web_view_impl_unittest.cc b/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc index 66e3d7f..f76f5ff 100644 --- a/chrome/test/chromedriver/web_view_impl_unittest.cc +++ b/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc @@ -8,9 +8,9 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/test/chromedriver/devtools_client.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/web_view_impl.h" +#include "chrome/test/chromedriver/chrome/devtools_client.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/web_view_impl.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/test/chromedriver/zip.cc b/chrome/test/chromedriver/chrome/zip.cc index 2ca5ee7..cbebc20 100644 --- a/chrome/test/chromedriver/zip.cc +++ b/chrome/test/chromedriver/chrome/zip.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/zip.h" +#include "chrome/test/chromedriver/chrome/zip.h" #include "base/bind.h" #include "base/file_util.h" #include "base/logging.h" #include "base/string16.h" #include "base/string_util.h" -#include "chrome/test/chromedriver/zip_internal.h" -#include "chrome/test/chromedriver/zip_reader.h" +#include "chrome/test/chromedriver/chrome/zip_internal.h" +#include "chrome/test/chromedriver/chrome/zip_reader.h" #include "net/base/file_stream.h" #if defined(USE_SYSTEM_MINIZIP) diff --git a/chrome/test/chromedriver/zip.h b/chrome/test/chromedriver/chrome/zip.h index 8b80e60..744509b 100644 --- a/chrome/test/chromedriver/zip.h +++ b/chrome/test/chromedriver/chrome/zip.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_ZIP_H_ -#define CHROME_TEST_CHROMEDRIVER_ZIP_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_ZIP_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_ZIP_H_ #include "base/callback.h" #include "base/files/file_path.h" @@ -41,4 +41,4 @@ bool Unzip(const base::FilePath& zip_file, const base::FilePath& dest_dir); } // namespace zip -#endif // CHROME_TEST_CHROMEDRIVER_ZIP_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_ZIP_H_ diff --git a/chrome/test/chromedriver/zip_internal.cc b/chrome/test/chromedriver/chrome/zip_internal.cc index 9f0ff8d..5cc04b8 100644 --- a/chrome/test/chromedriver/zip_internal.cc +++ b/chrome/test/chromedriver/chrome/zip_internal.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/zip.h" +#include "chrome/test/chromedriver/chrome/zip.h" #include <algorithm> diff --git a/chrome/test/chromedriver/zip_internal.h b/chrome/test/chromedriver/chrome/zip_internal.h index 6560fbd..8a1f703 100644 --- a/chrome/test/chromedriver/zip_internal.h +++ b/chrome/test/chromedriver/chrome/zip_internal.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_ZIP_INTERNAL_H_ -#define CHROME_TEST_CHROMEDRIVER_ZIP_INTERNAL_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_ZIP_INTERNAL_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_ZIP_INTERNAL_H_ #if defined(OS_WIN) #include <windows.h> @@ -59,4 +59,4 @@ const int kZipBufSize = 8192; } // namespace internal } // namespace zip -#endif // CHROME_TEST_CHROMEDRIVER_ZIP_INTERNAL_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_ZIP_INTERNAL_H_ diff --git a/chrome/test/chromedriver/zip_reader.cc b/chrome/test/chromedriver/chrome/zip_reader.cc index 29a77ed..df39672 100644 --- a/chrome/test/chromedriver/zip_reader.cc +++ b/chrome/test/chromedriver/chrome/zip_reader.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/chromedriver/zip_reader.h" +#include "chrome/test/chromedriver/chrome/zip_reader.h" #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/test/chromedriver/zip_internal.h" +#include "chrome/test/chromedriver/chrome/zip_internal.h" #include "net/base/file_stream.h" #if defined(USE_SYSTEM_MINIZIP) diff --git a/chrome/test/chromedriver/zip_reader.h b/chrome/test/chromedriver/chrome/zip_reader.h index 8f7261b..67bd319 100644 --- a/chrome/test/chromedriver/zip_reader.h +++ b/chrome/test/chromedriver/chrome/zip_reader.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_CHROMEDRIVER_ZIP_READER_H_ -#define CHROME_TEST_CHROMEDRIVER_ZIP_READER_H_ +#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_ZIP_READER_H_ +#define CHROME_TEST_CHROMEDRIVER_CHROME_ZIP_READER_H_ #include <string> @@ -174,4 +174,4 @@ class ZipReader { } // namespace zip -#endif // CHROME_TEST_CHROMEDRIVER_ZIP_READER_H_ +#endif // CHROME_TEST_CHROMEDRIVER_CHROME_ZIP_READER_H_ diff --git a/chrome/test/chromedriver/chrome_launcher_impl.cc b/chrome/test/chromedriver/chrome_launcher_impl.cc deleted file mode 100644 index e811582..0000000 --- a/chrome/test/chromedriver/chrome_launcher_impl.cc +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) 2012 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. - -#include "chrome/test/chromedriver/chrome_launcher_impl.h" - -#include <string> - -#include "base/command_line.h" -#include "base/files/file_path.h" -#include "base/process.h" -#include "base/process_util.h" -#include "base/stringprintf.h" -#include "base/strings/string_number_conversions.h" -#include "chrome/test/chromedriver/chrome.h" -#include "chrome/test/chromedriver/chrome_finder.h" -#include "chrome/test/chromedriver/chrome_impl.h" -#include "chrome/test/chromedriver/net/url_request_context_getter.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/version.h" - -ChromeLauncherImpl::ChromeLauncherImpl( - URLRequestContextGetter* context_getter, - const SyncWebSocketFactory& socket_factory) - : context_getter_(context_getter), - socket_factory_(socket_factory) {} - -ChromeLauncherImpl::~ChromeLauncherImpl() {} - -Status ChromeLauncherImpl::Launch( - const base::FilePath& chrome_exe, - scoped_ptr<Chrome>* chrome) { - base::FilePath program = chrome_exe; - if (program.empty()) { - if (!FindChrome(&program)) - return Status(kUnknownError, "cannot find Chrome binary"); - } - - int port = 33081; - CommandLine command(program); - command.AppendSwitchASCII("remote-debugging-port", base::IntToString(port)); - command.AppendSwitch("no-first-run"); - command.AppendSwitch("enable-logging"); - command.AppendSwitchASCII("logging-level", "1"); - base::ScopedTempDir user_data_dir; - if (!user_data_dir.CreateUniqueTempDir()) - return Status(kUnknownError, "cannot create temp dir for user data dir"); - command.AppendSwitchPath("user-data-dir", user_data_dir.path()); - command.AppendArg("data:text/html;charset=utf-8,"); - - base::LaunchOptions options; - base::ProcessHandle process; - if (!base::LaunchProcess(command, options, &process)) - return Status(kUnknownError, "chrome failed to start"); - scoped_ptr<ChromeImpl> chrome_impl(new ChromeImpl( - process, context_getter_, &user_data_dir, port, socket_factory_)); - Status status = chrome_impl->Init(); - if (status.IsError()) - return status; - chrome->reset(chrome_impl.release()); - return Status(kOk); -} diff --git a/chrome/test/chromedriver/chromedriver.cc b/chrome/test/chromedriver/chromedriver.cc index cb9063e..40e48fc 100644 --- a/chrome/test/chromedriver/chromedriver.cc +++ b/chrome/test/chromedriver/chromedriver.cc @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/values.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/command_executor.h" -#include "chrome/test/chromedriver/status.h" namespace { diff --git a/chrome/test/chromedriver/chromedriver_unittest.cc b/chrome/test/chromedriver/chromedriver_unittest.cc index fc8bef6..91e1e06 100644 --- a/chrome/test/chromedriver/chromedriver_unittest.cc +++ b/chrome/test/chromedriver/chromedriver_unittest.cc @@ -15,9 +15,9 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/values.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/chromedriver.h" #include "chrome/test/chromedriver/command_executor.h" -#include "chrome/test/chromedriver/status.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/test/chromedriver/command_executor.h b/chrome/test/chromedriver/command_executor.h index 5f8e5fe..e5d60c6c 100644 --- a/chrome/test/chromedriver/command_executor.h +++ b/chrome/test/chromedriver/command_executor.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" -#include "chrome/test/chromedriver/status.h" +#include "chrome/test/chromedriver/chrome/status.h" namespace base { class DictionaryValue; diff --git a/chrome/test/chromedriver/command_executor_impl.cc b/chrome/test/chromedriver/command_executor_impl.cc index fecb549..ca917b6 100644 --- a/chrome/test/chromedriver/command_executor_impl.cc +++ b/chrome/test/chromedriver/command_executor_impl.cc @@ -11,6 +11,8 @@ #include "base/stringprintf.h" #include "base/sys_info.h" #include "base/values.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/version.h" #include "chrome/test/chromedriver/command_names.h" #include "chrome/test/chromedriver/commands.h" #include "chrome/test/chromedriver/element_commands.h" @@ -18,8 +20,6 @@ #include "chrome/test/chromedriver/session.h" #include "chrome/test/chromedriver/session_commands.h" #include "chrome/test/chromedriver/session_map.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/version.h" #include "chrome/test/chromedriver/window_commands.h" #if defined(OS_MACOSX) diff --git a/chrome/test/chromedriver/command_executor_impl.h b/chrome/test/chromedriver/command_executor_impl.h index 63904b3..95e8408 100644 --- a/chrome/test/chromedriver/command_executor_impl.h +++ b/chrome/test/chromedriver/command_executor_impl.h @@ -13,11 +13,11 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/command.h" #include "chrome/test/chromedriver/command_executor.h" #include "chrome/test/chromedriver/net/sync_websocket_factory.h" #include "chrome/test/chromedriver/session_map.h" -#include "chrome/test/chromedriver/status.h" #include "chrome/test/chromedriver/synchronized_map.h" namespace base { diff --git a/chrome/test/chromedriver/command_executor_impl_unittest.cc b/chrome/test/chromedriver/command_executor_impl_unittest.cc index af37070..f538d06 100644 --- a/chrome/test/chromedriver/command_executor_impl_unittest.cc +++ b/chrome/test/chromedriver/command_executor_impl_unittest.cc @@ -8,8 +8,8 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/command_executor_impl.h" -#include "chrome/test/chromedriver/status.h" #include "testing/gtest/include/gtest/gtest.h" TEST(CommandExecutorImplTest, UnknownCommand) { diff --git a/chrome/test/chromedriver/commands.cc b/chrome/test/chromedriver/commands.cc index dd09603..6cef527 100644 --- a/chrome/test/chromedriver/commands.cc +++ b/chrome/test/chromedriver/commands.cc @@ -9,17 +9,17 @@ #include "base/stringprintf.h" #include "base/sys_info.h" #include "base/values.h" -#include "chrome/test/chromedriver/chrome.h" -#include "chrome/test/chromedriver/chrome_android_impl.h" -#include "chrome/test/chromedriver/chrome_desktop_impl.h" +#include "chrome/test/chromedriver/chrome/chrome.h" +#include "chrome/test/chromedriver/chrome/chrome_android_impl.h" +#include "chrome/test/chromedriver/chrome/chrome_desktop_impl.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/version.h" +#include "chrome/test/chromedriver/chrome/web_view.h" #include "chrome/test/chromedriver/net/net_util.h" #include "chrome/test/chromedriver/net/url_request_context_getter.h" #include "chrome/test/chromedriver/session.h" #include "chrome/test/chromedriver/session_map.h" -#include "chrome/test/chromedriver/status.h" #include "chrome/test/chromedriver/util.h" -#include "chrome/test/chromedriver/version.h" -#include "chrome/test/chromedriver/web_view.h" Status ExecuteGetStatus( const base::DictionaryValue& params, diff --git a/chrome/test/chromedriver/commands_unittest.cc b/chrome/test/chromedriver/commands_unittest.cc index 4a0b3ac..0cb4fc5 100644 --- a/chrome/test/chromedriver/commands_unittest.cc +++ b/chrome/test/chromedriver/commands_unittest.cc @@ -11,15 +11,15 @@ #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/values.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/stub_chrome.h" +#include "chrome/test/chromedriver/chrome/stub_web_view.h" +#include "chrome/test/chromedriver/chrome/web_view.h" #include "chrome/test/chromedriver/command_executor_impl.h" #include "chrome/test/chromedriver/commands.h" #include "chrome/test/chromedriver/element_commands.h" #include "chrome/test/chromedriver/fake_session_accessor.h" #include "chrome/test/chromedriver/session_commands.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/stub_chrome.h" -#include "chrome/test/chromedriver/stub_web_view.h" -#include "chrome/test/chromedriver/web_view.h" #include "chrome/test/chromedriver/window_commands.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/webdriver/atoms.h" diff --git a/chrome/test/chromedriver/element_commands.cc b/chrome/test/chromedriver/element_commands.cc index 524618c..9f7e461 100644 --- a/chrome/test/chromedriver/element_commands.cc +++ b/chrome/test/chromedriver/element_commands.cc @@ -10,14 +10,14 @@ #include "base/third_party/icu/icu_utf.h" #include "base/values.h" #include "chrome/test/chromedriver/basic_types.h" -#include "chrome/test/chromedriver/chrome.h" +#include "chrome/test/chromedriver/chrome/chrome.h" +#include "chrome/test/chromedriver/chrome/js.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" +#include "chrome/test/chromedriver/chrome/web_view.h" #include "chrome/test/chromedriver/element_util.h" -#include "chrome/test/chromedriver/js.h" #include "chrome/test/chromedriver/key_converter.h" #include "chrome/test/chromedriver/session.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/ui_events.h" -#include "chrome/test/chromedriver/web_view.h" #include "third_party/webdriver/atoms.h" namespace { diff --git a/chrome/test/chromedriver/element_util.cc b/chrome/test/chromedriver/element_util.cc index 266ff7c..b230e78 100644 --- a/chrome/test/chromedriver/element_util.cc +++ b/chrome/test/chromedriver/element_util.cc @@ -11,10 +11,10 @@ #include "base/time.h" #include "base/values.h" #include "chrome/test/chromedriver/basic_types.h" -#include "chrome/test/chromedriver/js.h" +#include "chrome/test/chromedriver/chrome/js.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/web_view.h" #include "chrome/test/chromedriver/session.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/web_view.h" #include "third_party/webdriver/atoms.h" namespace { diff --git a/chrome/test/chromedriver/embed_js_in_cpp.py b/chrome/test/chromedriver/embed_js_in_cpp.py index d1281f9..1425e4d 100755 --- a/chrome/test/chromedriver/embed_js_in_cpp.py +++ b/chrome/test/chromedriver/embed_js_in_cpp.py @@ -37,7 +37,7 @@ def main(): contents, func_name) global_string_map[script_name] = script - cpp_source.WriteSource('js', 'chrome/test/chromedriver', + cpp_source.WriteSource('js', 'chrome/test/chromedriver/chrome', options.directory, global_string_map) diff --git a/chrome/test/chromedriver/embed_user_data_dir_in_cpp.py b/chrome/test/chromedriver/embed_user_data_dir_in_cpp.py index 51080f7..46b32f5 100755 --- a/chrome/test/chromedriver/embed_user_data_dir_in_cpp.py +++ b/chrome/test/chromedriver/embed_user_data_dir_in_cpp.py @@ -27,7 +27,7 @@ def main(): contents = f.read() global_string_map[var_name] = contents - cpp_source.WriteSource('user_data_dir', 'chrome/test/chromedriver', + cpp_source.WriteSource('user_data_dir', 'chrome/test/chromedriver/chrome', options.directory, global_string_map) diff --git a/chrome/test/chromedriver/key_converter.cc b/chrome/test/chromedriver/key_converter.cc index 2fe9fd0..64c6099 100644 --- a/chrome/test/chromedriver/key_converter.cc +++ b/chrome/test/chromedriver/key_converter.cc @@ -7,9 +7,9 @@ #include "base/format_macros.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" #include "chrome/test/chromedriver/keycode_text_conversion.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/ui_events.h" namespace { diff --git a/chrome/test/chromedriver/key_converter_unittest.cc b/chrome/test/chromedriver/key_converter_unittest.cc index fbf63d7..e3d9cd8 100644 --- a/chrome/test/chromedriver/key_converter_unittest.cc +++ b/chrome/test/chromedriver/key_converter_unittest.cc @@ -7,10 +7,10 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" #include "chrome/test/chromedriver/key_converter.h" -#include "chrome/test/chromedriver/status.h" #include "chrome/test/chromedriver/test_util.h" -#include "chrome/test/chromedriver/ui_events.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/test/chromedriver/keycode_text_conversion_mac.mm b/chrome/test/chromedriver/keycode_text_conversion_mac.mm index 7892daf..ee85d90 100644 --- a/chrome/test/chromedriver/keycode_text_conversion_mac.mm +++ b/chrome/test/chromedriver/keycode_text_conversion_mac.mm @@ -10,7 +10,7 @@ #include "base/mac/scoped_cftyperef.h" #include "base/utf_string_conversions.h" -#include "chrome/test/chromedriver/ui_events.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" #include "ui/base/keycodes/keyboard_code_conversion_mac.h" std::string ConvertKeyCodeToText(ui::KeyboardCode key_code, int modifiers) { diff --git a/chrome/test/chromedriver/keycode_text_conversion_unittest.cc b/chrome/test/chromedriver/keycode_text_conversion_unittest.cc index 9fa8dbc..d81a84f 100644 --- a/chrome/test/chromedriver/keycode_text_conversion_unittest.cc +++ b/chrome/test/chromedriver/keycode_text_conversion_unittest.cc @@ -6,9 +6,9 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" #include "chrome/test/chromedriver/keycode_text_conversion.h" #include "chrome/test/chromedriver/test_util.h" -#include "chrome/test/chromedriver/ui_events.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/test/chromedriver/keycode_text_conversion_win.cc b/chrome/test/chromedriver/keycode_text_conversion_win.cc index 5a0c67e..64cc184 100644 --- a/chrome/test/chromedriver/keycode_text_conversion_win.cc +++ b/chrome/test/chromedriver/keycode_text_conversion_win.cc @@ -9,7 +9,7 @@ #include <cctype> #include "base/utf_string_conversions.h" -#include "chrome/test/chromedriver/ui_events.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" std::string ConvertKeyCodeToText(ui::KeyboardCode key_code, int modifiers) { UINT scan_code = ::MapVirtualKeyW(key_code, MAPVK_VK_TO_VSC); diff --git a/chrome/test/chromedriver/keycode_text_conversion_x.cc b/chrome/test/chromedriver/keycode_text_conversion_x.cc index df9e241..5b89935 100644 --- a/chrome/test/chromedriver/keycode_text_conversion_x.cc +++ b/chrome/test/chromedriver/keycode_text_conversion_x.cc @@ -11,7 +11,7 @@ #include <X11/Xutil.h> #include "base/utf_string_conversions.h" -#include "chrome/test/chromedriver/ui_events.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" #include "ui/base/keycodes/keyboard_code_conversion_x.h" #include "ui/base/x/x11_util.h" diff --git a/chrome/test/chromedriver/server/chromedriver_server.cc b/chrome/test/chromedriver/server/chromedriver_server.cc index 7b02b6f..bfa442c 100644 --- a/chrome/test/chromedriver/server/chromedriver_server.cc +++ b/chrome/test/chromedriver/server/chromedriver_server.cc @@ -14,10 +14,10 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" +#include "chrome/test/chromedriver/chrome/version.h" #include "chrome/test/chromedriver/command_executor_impl.h" #include "chrome/test/chromedriver/server/http_handler.h" #include "chrome/test/chromedriver/server/http_response.h" -#include "chrome/test/chromedriver/version.h" #include "third_party/mongoose/mongoose.h" namespace { diff --git a/chrome/test/chromedriver/server/http_handler.cc b/chrome/test/chromedriver/server/http_handler.cc index 6641d02..15eeb64 100644 --- a/chrome/test/chromedriver/server/http_handler.cc +++ b/chrome/test/chromedriver/server/http_handler.cc @@ -10,10 +10,10 @@ #include "base/string_util.h" #include "base/strings/string_split.h" #include "base/values.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/command_executor.h" #include "chrome/test/chromedriver/command_names.h" #include "chrome/test/chromedriver/server/http_response.h" -#include "chrome/test/chromedriver/status.h" #include "chrome/test/chromedriver/util.h" namespace { diff --git a/chrome/test/chromedriver/server/http_handler_unittest.cc b/chrome/test/chromedriver/server/http_handler_unittest.cc index 168ebafa..d516902 100644 --- a/chrome/test/chromedriver/server/http_handler_unittest.cc +++ b/chrome/test/chromedriver/server/http_handler_unittest.cc @@ -7,11 +7,11 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/command_executor.h" #include "chrome/test/chromedriver/command_names.h" #include "chrome/test/chromedriver/server/http_handler.h" #include "chrome/test/chromedriver/server/http_response.h" -#include "chrome/test/chromedriver/status.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/test/chromedriver/session.cc b/chrome/test/chromedriver/session.cc index fd039b8..996b205 100644 --- a/chrome/test/chromedriver/session.cc +++ b/chrome/test/chromedriver/session.cc @@ -7,10 +7,10 @@ #include <list> #include "base/values.h" -#include "chrome/test/chromedriver/chrome.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/version.h" -#include "chrome/test/chromedriver/web_view.h" +#include "chrome/test/chromedriver/chrome/chrome.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/version.h" +#include "chrome/test/chromedriver/chrome/web_view.h" FrameInfo::FrameInfo(const std::string& parent_frame_id, const std::string& frame_id, diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc index 5502d93..4bebfd8 100644 --- a/chrome/test/chromedriver/session_commands.cc +++ b/chrome/test/chromedriver/session_commands.cc @@ -12,11 +12,11 @@ #include "base/synchronization/lock.h" #include "base/values.h" #include "chrome/test/chromedriver/basic_types.h" -#include "chrome/test/chromedriver/chrome.h" +#include "chrome/test/chromedriver/chrome/chrome.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/web_view.h" #include "chrome/test/chromedriver/session.h" #include "chrome/test/chromedriver/session_map.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/web_view.h" namespace { diff --git a/chrome/test/chromedriver/session_commands_unittest.cc b/chrome/test/chromedriver/session_commands_unittest.cc index 2ae7772..28490cd 100644 --- a/chrome/test/chromedriver/session_commands_unittest.cc +++ b/chrome/test/chromedriver/session_commands_unittest.cc @@ -8,11 +8,11 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" +#include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/fake_session_accessor.h" #include "chrome/test/chromedriver/session.h" #include "chrome/test/chromedriver/session_commands.h" #include "chrome/test/chromedriver/session_map.h" -#include "chrome/test/chromedriver/status.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/test/chromedriver/session_unittest.cc b/chrome/test/chromedriver/session_unittest.cc index 095fe7e..22557e3 100644 --- a/chrome/test/chromedriver/session_unittest.cc +++ b/chrome/test/chromedriver/session_unittest.cc @@ -8,10 +8,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/stub_chrome.h" +#include "chrome/test/chromedriver/chrome/stub_web_view.h" #include "chrome/test/chromedriver/session.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/stub_chrome.h" -#include "chrome/test/chromedriver/stub_web_view.h" #include "testing/gtest/include/gtest/gtest.h" TEST(SessionAccessorTest, LocksSession) { diff --git a/chrome/test/chromedriver/window_commands.cc b/chrome/test/chromedriver/window_commands.cc index 85e79d9..1b432ad 100644 --- a/chrome/test/chromedriver/window_commands.cc +++ b/chrome/test/chromedriver/window_commands.cc @@ -13,14 +13,14 @@ #include "base/time.h" #include "base/values.h" #include "chrome/test/chromedriver/basic_types.h" -#include "chrome/test/chromedriver/chrome.h" +#include "chrome/test/chromedriver/chrome/chrome.h" +#include "chrome/test/chromedriver/chrome/js.h" +#include "chrome/test/chromedriver/chrome/status.h" +#include "chrome/test/chromedriver/chrome/ui_events.h" +#include "chrome/test/chromedriver/chrome/web_view.h" #include "chrome/test/chromedriver/element_util.h" -#include "chrome/test/chromedriver/js.h" #include "chrome/test/chromedriver/session.h" -#include "chrome/test/chromedriver/status.h" -#include "chrome/test/chromedriver/ui_events.h" #include "chrome/test/chromedriver/util.h" -#include "chrome/test/chromedriver/web_view.h" namespace { |