diff options
57 files changed, 114 insertions, 123 deletions
diff --git a/ceee/ie/plugin/bho/browser_helper_object.cc b/ceee/ie/plugin/bho/browser_helper_object.cc index cc2be5e..570e67f 100644 --- a/ceee/ie/plugin/bho/browser_helper_object.cc +++ b/ceee/ie/plugin/bho/browser_helper_object.cc @@ -28,8 +28,8 @@ #include "ceee/ie/plugin/scripting/script_host.h" #include "chrome/browser/automation/extension_automation_constants.h" #include "chrome/browser/extensions/extension_tabs_module_constants.h" +#include "chrome/common/automation_constants.h" #include "chrome/common/url_constants.h" -#include "chrome/test/automation/automation_constants.h" #include "googleurl/src/gurl.h" #include "broker_lib.h" // NOLINT diff --git a/ceee/ie/plugin/toolband/tool_band.cc b/ceee/ie/plugin/toolband/tool_band.cc index e3ea63c..eee6488 100644 --- a/ceee/ie/plugin/toolband/tool_band.cc +++ b/ceee/ie/plugin/toolband/tool_band.cc @@ -19,8 +19,8 @@ #include "ceee/ie/common/extension_manifest.h" #include "ceee/ie/common/ceee_module_util.h" #include "ceee/ie/plugin/bho/tool_band_visibility.h" +#include "chrome/common/automation_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/test/automation/automation_constants.h" #include "chrome_frame/com_message_event.h" _ATL_FUNC_INFO ToolBand::handler_type_idispatch_ = diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index cbbc786..17c3b32 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -85,6 +85,7 @@ #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/common/automation_constants.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -95,7 +96,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/tab_proxy.h" #include "net/proxy/proxy_service.h" #include "net/proxy/proxy_config_service_fixed.h" diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index 280d916..c17aadf 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -23,9 +23,9 @@ #include "chrome/browser/autofill/field_types.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/tab_contents/navigation_entry.h" +#include "chrome/common/automation_constants.h" #include "chrome/common/content_settings.h" #include "chrome/common/notification_observer.h" -#include "chrome/test/automation/automation_constants.h" #include "ipc/ipc_message.h" #include "ipc/ipc_channel.h" #if defined(OS_WIN) diff --git a/chrome/browser/automation/automation_provider_gtk.cc b/chrome/browser/automation/automation_provider_gtk.cc index 37c4fb8..bf6a15c 100644 --- a/chrome/browser/automation/automation_provider_gtk.cc +++ b/chrome/browser/automation/automation_provider_gtk.cc @@ -13,7 +13,7 @@ #include "chrome/browser/gtk/browser_window_gtk.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/view_id_util.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "gfx/point.h" #include "gfx/rect.h" diff --git a/chrome/browser/automation/automation_provider_json.cc b/chrome/browser/automation/automation_provider_json.cc index c58b622..16fd8d4 100644 --- a/chrome/browser/automation/automation_provider_json.cc +++ b/chrome/browser/automation/automation_provider_json.cc @@ -8,7 +8,7 @@ #include "base/json/string_escape.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/automation/automation_provider.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" namespace { diff --git a/chrome/browser/automation/automation_provider_mac.mm b/chrome/browser/automation/automation_provider_mac.mm index 99c1bdb..451e7f1 100644 --- a/chrome/browser/automation/automation_provider_mac.mm +++ b/chrome/browser/automation/automation_provider_mac.mm @@ -14,7 +14,7 @@ #include "chrome/browser/cocoa/tab_window_controller.h" #include "chrome/browser/view_ids.h" #import "chrome/browser/cocoa/browser_window_controller.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "gfx/point.h" #include "gfx/rect.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index d5fb64f..2241f69 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -35,9 +35,9 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/translate/page_translated_details.h" #include "chrome/browser/translate/translate_infobar_delegate.h" +#include "chrome/common/automation_constants.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" -#include "chrome/test/automation/automation_constants.h" #include "gfx/rect.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h index 7b76638..708d0c4 100644 --- a/chrome/browser/automation/automation_provider_observers.h +++ b/chrome/browser/automation/automation_provider_observers.h @@ -21,10 +21,10 @@ #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/search_engines/template_url_model_observer.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_type.h" -#include "chrome/test/automation/automation_messages.h" class AutocompleteEditModel; class AutomationProvider; diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc index a988a2f..56fe617 100644 --- a/chrome/browser/automation/automation_provider_win.cc +++ b/chrome/browser/automation/automation_provider_win.cc @@ -22,8 +22,8 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/bookmark_bar_view.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/page_zoom.h" -#include "chrome/test/automation/automation_messages.h" #include "views/focus/accelerator_handler.h" #include "views/widget/root_view.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc index ecbbddc..98461d7 100644 --- a/chrome/browser/automation/automation_resource_message_filter.cc +++ b/chrome/browser/automation/automation_resource_message_filter.cc @@ -15,8 +15,8 @@ #include "chrome/browser/net/url_request_slow_download_job.h" #include "chrome/browser/net/url_request_slow_http_job.h" #include "chrome/browser/renderer_host/resource_message_filter.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/chrome_paths.h" -#include "chrome/test/automation/automation_messages.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_filter.h" diff --git a/chrome/browser/automation/automation_resource_tracker.cc b/chrome/browser/automation/automation_resource_tracker.cc index a82265d..49797c6e 100644 --- a/chrome/browser/automation/automation_resource_tracker.cc +++ b/chrome/browser/automation/automation_resource_tracker.cc @@ -4,8 +4,8 @@ #include "chrome/browser/automation/automation_resource_tracker.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/notification_service.h" -#include "chrome/test/automation/automation_messages.h" AutomationResourceTrackerImpl::AutomationResourceTrackerImpl( IPC::Message::Sender* sender) diff --git a/chrome/browser/automation/chrome_frame_automation_provider.cc b/chrome/browser/automation/chrome_frame_automation_provider.cc index b3ea659..4de788a 100644 --- a/chrome/browser/automation/chrome_frame_automation_provider.cc +++ b/chrome/browser/automation/chrome_frame_automation_provider.cc @@ -5,7 +5,7 @@ #include "chrome/browser/automation/chrome_frame_automation_provider.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "ipc/ipc_message.h" #include "ipc/ipc_channel.h" diff --git a/chrome/browser/automation/extension_port_container.cc b/chrome/browser/automation/extension_port_container.cc index f5a1d75..baf6517 100644 --- a/chrome/browser/automation/extension_port_container.cc +++ b/chrome/browser/automation/extension_port_container.cc @@ -15,9 +15,9 @@ #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" -#include "chrome/test/automation/automation_messages.h" // TODO(siggi): Find a more structured way to read and write JSON messages. diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 4c2fcce..1b8b5b9 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -66,7 +66,7 @@ #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "net/base/cookie_store.h" #include "net/url_request/url_request_context.h" #include "views/event.h" diff --git a/chrome/browser/automation/testing_automation_provider_views.cc b/chrome/browser/automation/testing_automation_provider_views.cc index 6048cd8..f8631cf 100644 --- a/chrome/browser/automation/testing_automation_provider_views.cc +++ b/chrome/browser/automation/testing_automation_provider_views.cc @@ -9,7 +9,7 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/toolbar_view.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "gfx/point.h" #include "views/controls/menu/menu_wrapper.h" #include "views/view.h" diff --git a/chrome/browser/automation/ui_controls_linux.cc b/chrome/browser/automation/ui_controls_linux.cc index a2dd0ae..21cd0dd 100644 --- a/chrome/browser/automation/ui_controls_linux.cc +++ b/chrome/browser/automation/ui_controls_linux.cc @@ -13,7 +13,7 @@ #include "base/message_loop.h" #include "chrome/browser/automation/ui_controls_internal.h" #include "chrome/browser/gtk/gtk_util.h" -#include "chrome/test/automation/automation_constants.h" +#include "chrome/common/automation_constants.h" #if defined(TOOLKIT_VIEWS) #include "views/view.h" diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index fc4bd63..1b73b68 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -11,7 +11,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "net/base/cookie_monster.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/extensions/extension_uitest.cc b/chrome/browser/extensions/extension_uitest.cc index f074c9b..8688806 100644 --- a/chrome/browser/extensions/extension_uitest.cc +++ b/chrome/browser/extensions/extension_uitest.cc @@ -8,9 +8,9 @@ #include "base/values.h" #include "chrome/browser/automation/extension_automation_constants.h" #include "chrome/browser/extensions/extension_tabs_module_constants.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" -#include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/automation_proxy_uitest.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_test.h" diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 88a1da7..41b0a99 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -32,6 +32,7 @@ #include "chrome/browser/views/page_info_bubble_view.h" #include "chrome/browser/views/tab_contents/render_view_context_menu_views.h" #include "chrome/browser/views/tab_contents/tab_contents_container.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/render_messages.h" @@ -40,7 +41,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/url_constants.h" -#include "chrome/test/automation/automation_messages.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/grid_layout.h" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 5212da2..e148da9 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1789,12 +1789,8 @@ 'sources': [ 'test/automation/autocomplete_edit_proxy.cc', 'test/automation/autocomplete_edit_proxy.h', - 'test/automation/automation_constants.h', 'test/automation/automation_handle_tracker.cc', 'test/automation/automation_handle_tracker.h', - 'test/automation/automation_messages.cc', - 'test/automation/automation_messages.h', - 'test/automation/automation_messages_internal.h', 'test/automation/automation_proxy.cc', 'test/automation/automation_proxy.h', 'test/automation/browser_proxy.cc', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index e1133aa..4966c6c 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3365,12 +3365,6 @@ 'browser/zygote_host_linux.cc', 'browser/zygote_main_linux.cc', - # TODO(erg): http://crbug.com/51409 These files are also specified as - # part of the automation project, but we need these definitions here, - # too, due to usage in our automation provider. - 'test/automation/automation_messages.cc', - 'test/automation/automation_messages.h', - # These files are generated by GRIT. '<(grit_out_dir)/grit/bookmark_manager_resources_map.cc', '<(grit_out_dir)/grit/shared_resources_map.cc', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 4c17aaf..fec40f0 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -224,6 +224,9 @@ 'common/appcache/appcache_dispatcher.h', 'common/automation_constants.cc', 'common/automation_constants.h', + 'common/automation_messages.cc', + 'common/automation_messages.h', + 'common/automation_messages_internal.h', 'common/child_process_host.cc', 'common/child_process_host.h', 'common/chrome_descriptors.h', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 32601de..9472bd1 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -7,9 +7,9 @@ 'pyautolib_sources': [ 'app/chrome_command_ids.h', 'app/chrome_dll_resource.h', + 'common/automation_constants.h', 'common/pref_names.cc', 'common/pref_names.h', - 'test/automation/automation_constants.h', 'test/automation/browser_proxy.cc', 'test/automation/browser_proxy.h', 'test/automation/tab_proxy.cc', diff --git a/chrome/common/DEPS b/chrome/common/DEPS index 18175ac..26ce642 100644 --- a/chrome/common/DEPS +++ b/chrome/common/DEPS @@ -17,6 +17,15 @@ include_rules = [ "+third_party/sqlite", "+third_party/zlib", + # TODO(erg): A previous version of this patch moved everything needed from + # tab_contents/ to chrome/common/ but failed on the buildbot (but not locally + # or on the trybots). Temporarily add this suppression as I commit what was a + # very large patch piecewise, removing it with the final patch that will move + # the files again and remove this override. + # + # (Also: the only thing used from these headers are enums.) + "+chrome/browser/tab_contents", + # FIXME - refactor code and remove these dependencies "+chrome/installer", ] diff --git a/chrome/common/automation_constants.h b/chrome/common/automation_constants.h index 6959af7..13b120e 100644 --- a/chrome/common/automation_constants.h +++ b/chrome/common/automation_constants.h @@ -15,6 +15,42 @@ extern const char kJSONProxyNoProxy[]; extern const char kJSONProxyPacUrl[]; extern const char kJSONProxyBypassList[]; extern const char kJSONProxyServer[]; + +// Amount of time to wait before querying the browser. +static const int kSleepTime = 250; } +// Used by AutomationProxy, declared here so that other headers don't need +// to include automation_proxy.h. +enum AutomationLaunchResult { + AUTOMATION_LAUNCH_RESULT_INVALID = -1, + AUTOMATION_SUCCESS, + AUTOMATION_TIMEOUT, + AUTOMATION_VERSION_MISMATCH, + AUTOMATION_CREATE_TAB_FAILED, + AUTOMATION_SERVER_CRASHED, +}; + +enum AutomationMsg_NavigationResponseValues { + AUTOMATION_MSG_NAVIGATION_ERROR = 0, + AUTOMATION_MSG_NAVIGATION_SUCCESS, + AUTOMATION_MSG_NAVIGATION_AUTH_NEEDED, +}; + +enum AutomationMsg_ExtensionResponseValues { + AUTOMATION_MSG_EXTENSION_INSTALL_SUCCEEDED = 0, + AUTOMATION_MSG_EXTENSION_INSTALL_FAILED +}; + +// Used in the AutomationMsg_GetExtensionProperty to identify which extension +// property should be retrieved, instead of having separate messages for each +// property. +enum AutomationMsg_ExtensionProperty { + AUTOMATION_MSG_EXTENSION_ID = 0, + AUTOMATION_MSG_EXTENSION_NAME, + AUTOMATION_MSG_EXTENSION_VERSION, + AUTOMATION_MSG_EXTENSION_BROWSER_ACTION_INDEX, +}; + + #endif // CHROME_COMMON_AUTOMATION_CONSTANTS_H__ diff --git a/chrome/test/automation/automation_messages.cc b/chrome/common/automation_messages.cc index 8c26327..df6d0e2 100644 --- a/chrome/test/automation/automation_messages.cc +++ b/chrome/common/automation_messages.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/test/automation/automation_messages_internal.h" + "chrome/common/automation_messages_internal.h" #include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/test/automation/automation_messages.h b/chrome/common/automation_messages.h index afaa87f..bc77704 100644 --- a/chrome/test/automation/automation_messages.h +++ b/chrome/common/automation_messages.h @@ -2,21 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ -#define CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ +#ifndef CHROME_COMMON_AUTOMATION_MESSAGES_H__ +#define CHROME_COMMON_AUTOMATION_MESSAGES_H__ #pragma once #include <string> #include "base/basictypes.h" +#include "chrome/common/automation_constants.h" +#include "chrome/common/common_param_traits.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/security_style.h" -#include "chrome/common/common_param_traits.h" -#include "chrome/test/automation/automation_constants.h" #include "gfx/rect.h" #include "net/base/upload_data.h" - struct AutomationMsg_Find_Params { // Unused value, which exists only for backwards compat. int unused; @@ -548,7 +547,7 @@ struct MiniContextMenuParams { GURL frame_url; }; -// Traits for ContextMenuParams structure to pack/unpack. +// Traits for MiniContextMenuParams structure to pack/unpack. template <> struct ParamTraits<MiniContextMenuParams> { typedef MiniContextMenuParams param_type; @@ -639,7 +638,7 @@ struct ParamTraits<AttachExternalTabParams> { } // namespace IPC #define MESSAGES_INTERNAL_FILE \ - "chrome/test/automation/automation_messages_internal.h" + "chrome/common/automation_messages_internal.h" #include "ipc/ipc_message_macros.h" -#endif // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ +#endif // CHROME_COMMON_AUTOMATION_MESSAGES_H__ diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/common/automation_messages_internal.h index 89aba25..97e0a20 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/common/automation_messages_internal.h @@ -612,7 +612,7 @@ IPC_BEGIN_MESSAGES(Automation) // - int: handle of the tab // Response: // - bool: whether the operation was successful. - // - NavigationEntry::PageType: the type of the page currently displayed. + // - PageType: the type of the page currently displayed. IPC_SYNC_MESSAGE_ROUTED1_2(AutomationMsg_GetPageType, int, bool, NavigationEntry::PageType) diff --git a/chrome/test/automation/autocomplete_edit_proxy.cc b/chrome/test/automation/autocomplete_edit_proxy.cc index 5bfd13c..184239a 100644 --- a/chrome/test/automation/autocomplete_edit_proxy.cc +++ b/chrome/test/automation/autocomplete_edit_proxy.cc @@ -6,8 +6,8 @@ #include <vector> -#include "chrome/test/automation/automation_constants.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_constants.h" +#include "chrome/common/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" using base::TimeDelta; diff --git a/chrome/test/automation/automation_constants.h b/chrome/test/automation/automation_constants.h deleted file mode 100644 index f34c0f2..0000000 --- a/chrome/test/automation/automation_constants.h +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_TEST_AUTOMATION_AUTOMATION_CONSTANTS_H_ -#define CHROME_TEST_AUTOMATION_AUTOMATION_CONSTANTS_H_ -#pragma once - -namespace automation { -// Amount of time to wait before querying the browser. -static const int kSleepTime = 250; -} - -// Used by AutomationProxy, declared here so that other headers don't need -// to include automation_proxy.h. -enum AutomationLaunchResult { - AUTOMATION_LAUNCH_RESULT_INVALID = -1, - AUTOMATION_SUCCESS, - AUTOMATION_TIMEOUT, - AUTOMATION_VERSION_MISMATCH, - AUTOMATION_CREATE_TAB_FAILED, - AUTOMATION_SERVER_CRASHED, -}; - -enum AutomationMsg_NavigationResponseValues { - AUTOMATION_MSG_NAVIGATION_ERROR = 0, - AUTOMATION_MSG_NAVIGATION_SUCCESS, - AUTOMATION_MSG_NAVIGATION_AUTH_NEEDED, -}; - -enum AutomationMsg_ExtensionResponseValues { - AUTOMATION_MSG_EXTENSION_INSTALL_SUCCEEDED = 0, - AUTOMATION_MSG_EXTENSION_INSTALL_FAILED -}; - -// Used in the AutomationMsg_GetExtensionProperty to identify which extension -// property should be retrieved, instead of having separate messages for each -// property. -enum AutomationMsg_ExtensionProperty { - AUTOMATION_MSG_EXTENSION_ID = 0, - AUTOMATION_MSG_EXTENSION_NAME, - AUTOMATION_MSG_EXTENSION_VERSION, - AUTOMATION_MSG_EXTENSION_BROWSER_ACTION_INDEX, -}; - -#endif // CHROME_TEST_AUTOMATION_AUTOMATION_CONSTANTS_H_ diff --git a/chrome/test/automation/automation_handle_tracker.cc b/chrome/test/automation/automation_handle_tracker.cc index ab29c2a..b5613a5 100644 --- a/chrome/test/automation/automation_handle_tracker.cc +++ b/chrome/test/automation/automation_handle_tracker.cc @@ -4,7 +4,7 @@ #include "chrome/test/automation/automation_handle_tracker.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" AutomationResourceProxy::AutomationResourceProxy( diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc index 748ffc2..fbdde25 100644 --- a/chrome/test/automation/automation_proxy.cc +++ b/chrome/test/automation/automation_proxy.cc @@ -14,9 +14,9 @@ #include "base/process_util.h" #include "base/ref_counted.h" #include "base/waitable_event.h" +#include "chrome/common/automation_constants.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/test/automation/automation_constants.h" -#include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/extension_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h index 344c248..b54dc10 100644 --- a/chrome/test/automation/automation_proxy.h +++ b/chrome/test/automation/automation_proxy.h @@ -18,7 +18,7 @@ #include "base/thread.h" #include "base/waitable_event.h" #include "chrome/browser/browser.h" -#include "chrome/test/automation/automation_constants.h" +#include "chrome/common/automation_constants.h" #include "chrome/test/automation/automation_handle_tracker.h" #include "chrome/test/automation/browser_proxy.h" #include "gfx/native_widget_types.h" diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index 1e5b2cd..2da2302 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -18,11 +18,11 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_request_slow_http_job.h" #include "chrome/browser/view_ids.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/json_value_serializer.h" #include "chrome/test/automation/autocomplete_edit_proxy.h" -#include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/automation_proxy_uitest.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/test/automation/browser_proxy.cc b/chrome/test/automation/browser_proxy.cc index b5a89eb..88d833a 100644 --- a/chrome/test/automation/browser_proxy.cc +++ b/chrome/test/automation/browser_proxy.cc @@ -11,9 +11,9 @@ #include "base/logging.h" #include "base/platform_thread.h" #include "base/time.h" +#include "chrome/common/automation_constants.h" +#include "chrome/common/automation_messages.h" #include "chrome/test/automation/autocomplete_edit_proxy.h" -#include "chrome/test/automation/automation_constants.h" -#include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" diff --git a/chrome/test/automation/extension_proxy.cc b/chrome/test/automation/extension_proxy.cc index 29fd54c..4390c10 100644 --- a/chrome/test/automation/extension_proxy.cc +++ b/chrome/test/automation/extension_proxy.cc @@ -5,7 +5,7 @@ #include "chrome/test/automation/extension_proxy.h" #include "base/string_number_conversions.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/automation/extension_proxy.h b/chrome/test/automation/extension_proxy.h index 485d469..ac4d7ec 100644 --- a/chrome/test/automation/extension_proxy.h +++ b/chrome/test/automation/extension_proxy.h @@ -9,7 +9,7 @@ #include <string> #include "base/compiler_specific.h" -#include "chrome/test/automation/automation_constants.h" +#include "chrome/common/automation_constants.h" #include "chrome/test/automation/automation_handle_tracker.h" class AutomationMessageSender; diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index a338de7..d7c99dd 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -9,9 +9,8 @@ #include "base/logging.h" #include "base/string16.h" #include "base/utf_string_conversions.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/json_value_serializer.h" -#include "chrome/test/automation/automation_constants.h" -#include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" #include "googleurl/src/gurl.h" diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index 92a80a7..217863c 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -20,7 +20,7 @@ #include "chrome/browser/download/save_package.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/security_style.h" -#include "chrome/test/automation/automation_constants.h" +#include "chrome/common/automation_constants.h" #include "chrome/test/automation/automation_handle_tracker.h" #include "chrome/test/automation/dom_element_proxy.h" #include "chrome/test/automation/javascript_execution_controller.h" diff --git a/chrome/test/automation/window_proxy.cc b/chrome/test/automation/window_proxy.cc index 1a66edc..6774e6d 100644 --- a/chrome/test/automation/window_proxy.cc +++ b/chrome/test/automation/window_proxy.cc @@ -8,8 +8,8 @@ #include <algorithm> #include "base/logging.h" -#include "chrome/test/automation/automation_constants.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_constants.h" +#include "chrome/common/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/test/pyautolib/pyautolib.i b/chrome/test/pyautolib/pyautolib.i index 345a64c..f228a88 100644 --- a/chrome/test/pyautolib/pyautolib.i +++ b/chrome/test/pyautolib/pyautolib.i @@ -27,12 +27,13 @@ // Headers that can be swigged directly. %include "chrome/app/chrome_command_ids.h" +%include "chrome/app/chrome_dll_resource.h" +%include "chrome/common/automation_constants.h" %include "chrome/common/pref_names.h" -%include "chrome/test/automation/automation_constants.h" %{ +#include "chrome/common/automation_constants.h" #include "chrome/common/pref_names.h" -#include "chrome/test/automation/automation_constants.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/pyautolib/pyautolib.h" diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index 770f0f2..571c16a 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -50,6 +50,7 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prefs/pref_service.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -58,7 +59,6 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 37ed73b..29075b3 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -32,6 +32,7 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_fixer_upper.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -39,7 +40,6 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/url_constants.h" -#include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/javascript_execution_controller.h" diff --git a/chrome_frame/cfproxy.h b/chrome_frame/cfproxy.h index dc0e4b0..c3acf7a 100644 --- a/chrome_frame/cfproxy.h +++ b/chrome_frame/cfproxy.h @@ -13,8 +13,8 @@ #include "base/lock.h" #include "base/time.h" // for base::TimeDelta #include "base/file_path.h" +#include "chrome/common/automation_constants.h" #include "chrome/common/page_zoom.h" -#include "chrome/test/automation/automation_constants.h" enum FindInPageDirection { BACK = 0, FWD = 1 }; enum FindInPageCase { IGNORE_CASE = 0, CASE_SENSITIVE = 1 }; diff --git a/chrome_frame/cfproxy_proxy.cc b/chrome_frame/cfproxy_proxy.cc index 5d6a780..7dcb944 100644 --- a/chrome_frame/cfproxy_proxy.cc +++ b/chrome_frame/cfproxy_proxy.cc @@ -6,7 +6,7 @@ #include "base/tuple.h" #include "ipc/ipc_sync_message.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" CFProxy::CFProxy(CFProxyTraits* api) : ipc_thread_("ipc"), sync_dispatcher_(&tab2delegate_), diff --git a/chrome_frame/cfproxy_support.cc b/chrome_frame/cfproxy_support.cc index 6b5224b..dc2eb8b 100644 --- a/chrome_frame/cfproxy_support.cc +++ b/chrome_frame/cfproxy_support.cc @@ -8,8 +8,8 @@ #include "base/atomic_sequence_num.h" #include "base/command_line.h" #include "base/process_util.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/chrome_switches.h" -#include "chrome/test/automation/automation_messages.h" #include "chrome_frame/chrome_launcher_utils.h" #include "chrome_frame/utils.h" // for IsHeadlessMode(); diff --git a/chrome_frame/cfproxy_test.cc b/chrome_frame/cfproxy_test.cc index 6a547f8..3a99b92 100644 --- a/chrome_frame/cfproxy_test.cc +++ b/chrome_frame/cfproxy_test.cc @@ -5,8 +5,8 @@ #include <string> #include "base/file_path.h" #include "base/waitable_event.h" +#include "chrome/common/automation_messages.h" #include "chrome_frame/cfproxy_private.h" -#include "chrome/test/automation/automation_messages.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock_mutant.h" diff --git a/chrome_frame/chrome_frame_delegate.h b/chrome_frame/chrome_frame_delegate.h index d111d38..c7890b7 100644 --- a/chrome_frame/chrome_frame_delegate.h +++ b/chrome_frame/chrome_frame_delegate.h @@ -13,7 +13,7 @@ #include "base/file_path.h" #include "base/lock.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "ipc/ipc_message.h" // A common interface supported by all the browser specific ChromeFrame diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc index 785f6af..ca402d9 100644 --- a/chrome_frame/external_tab.cc +++ b/chrome_frame/external_tab.cc @@ -7,7 +7,7 @@ #include "base/tracked.h" #include "base/task.h" #include "base/waitable_event.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "chrome_frame/utils.h" DISABLE_RUNNABLE_METHOD_REFCOUNT(ExternalTabProxy); diff --git a/chrome_frame/external_tab.h b/chrome_frame/external_tab.h index 5411528..8affbc1 100644 --- a/chrome_frame/external_tab.h +++ b/chrome_frame/external_tab.h @@ -14,8 +14,8 @@ #include "base/scoped_comptr_win.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "chrome/common//page_zoom.h" -#include "chrome/test/automation/automation_constants.h" +#include "chrome/common/automation_constants.h" +#include "chrome/common/page_zoom.h" #include "chrome_frame/cfproxy.h" #include "chrome_frame/task_marshaller.h" #include "googleurl/src/gurl.h" diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc index 015ed7b..5e3e44a 100644 --- a/chrome_frame/external_tab_test.cc +++ b/chrome_frame/external_tab_test.cc @@ -9,7 +9,7 @@ // #include "base/waitable_event.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock_mutant.h" diff --git a/chrome_frame/plugin_url_request.cc b/chrome_frame/plugin_url_request.cc index c4bf932..236090b 100644 --- a/chrome_frame/plugin_url_request.cc +++ b/chrome_frame/plugin_url_request.cc @@ -4,7 +4,7 @@ #include "chrome_frame/plugin_url_request.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "chrome_frame/np_browser_functions.h" PluginUrlRequest::PluginUrlRequest() diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc index 7594f30..5b8a9a6 100644 --- a/chrome_frame/test/net/test_automation_provider.cc +++ b/chrome_frame/test/net/test_automation_provider.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/file_version_info.h" #include "base/path_service.h" -#include "chrome/test/automation/automation_messages.h" +#include "chrome/common/automation_messages.h" #include "chrome_frame/test/net/test_automation_resource_message_filter.h" namespace { diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 482e00e..4116464 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -37,6 +37,7 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_value_store.h" +#include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" @@ -46,7 +47,6 @@ #include "chrome/common/pref_names.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/test/ie_event_sink.h" -#include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/ipc/ipc_message_impl_macros.h b/ipc/ipc_message_impl_macros.h index dfa7c91..461f2e1 100644 --- a/ipc/ipc_message_impl_macros.h +++ b/ipc/ipc_message_impl_macros.h @@ -22,6 +22,7 @@ // don't understand #include MESSAGES_INTERNAL_FILE. See http://crbug.com/7828 #if 0 #include "ipc/ipc_sync_message_unittest.h" +#include "chrome/common/automation_messages_internal.h" #include "chrome/common/devtools_messages_internal.h" #include "chrome/common/gpu_messages_internal.h" #include "chrome/common/nacl_messages_internal.h" @@ -30,7 +31,6 @@ #include "chrome/common/service_messages_internal.h" #include "chrome/common/utility_messages_internal.h" #include "chrome/common/worker_messages_internal.h" -#include "chrome/test/automation/automation_messages_internal.h" #endif // These are probalby still defined because of ipc_message_macros.h should be diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h index 6fd789e..fad4163 100644 --- a/ipc/ipc_message_macros.h +++ b/ipc/ipc_message_macros.h @@ -52,10 +52,10 @@ // don't understand #include MESSAGES_INTERNAL_FILE. See http://crbug.com/7828 #if 0 #include "ipc/ipc_sync_message_unittest.h" +#include "chrome/common/automation_messages_internal.h" +#include "chrome/common/devtools_messages_internal.h" #include "chrome/common/plugin_messages_internal.h" #include "chrome/common/render_messages_internal.h" -#include "chrome/common/devtools_messages_internal.h" -#include "chrome/test/automation/automation_messages_internal.h" #include "chrome/common/worker_messages_internal.h" #endif |