diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 18:17:23 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 18:17:23 +0000 |
| commit | 363680faae60b8ec1f6a57d3c701935a6f046fb6 (patch) | |
| tree | 4530c2be35fbe1dfe384ffe03e8775993fa8f4fb /chrome_frame/test | |
| parent | 1693996df25b186a4523e9148fd8a5fe0405ccde (diff) | |
| download | chromium_src-363680faae60b8ec1f6a57d3c701935a6f046fb6.zip chromium_src-363680faae60b8ec1f6a57d3c701935a6f046fb6.tar.gz chromium_src-363680faae60b8ec1f6a57d3c701935a6f046fb6.tar.bz2 | |
Refactor automation messages.
automation_messages used to live in chrome/test/automation, when it's needed by
browser and chrome_frame. When I started lifting code out of headers and into
implementation files, I was getting link errors and temporarily solved the
problem by compiling the cc files manually into libbrowser.a. Now this is part
of chrome/common/ which is included by all targets needed.
While doing this, discover that automation IPC redefines the ContextMenuParams struct. Rename it to MiniContextMenuParams.
BUG=51409
TEST=none
Review URL: http://codereview.chromium.org/4200007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/automation_client_mock.h | 2 | ||||
| -rw-r--r-- | chrome_frame/test/net/test_automation_provider.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h index 2ac30e8..58928b8 100644 --- a/chrome_frame/test/automation_client_mock.h +++ b/chrome_frame/test/automation_client_mock.h @@ -51,7 +51,7 @@ struct MockCFDelegate : public ChromeFrameDelegateImpl { const std::string& origin, const std::string& target)); MOCK_METHOD4(OnHandleContextMenu, void(int tab_handle, HANDLE menu_handle, - int align_flags, const IPC::ContextMenuParams& params)); + int align_flags, const IPC::MiniContextMenuParams& params)); MOCK_METHOD3(OnRequestStart, void(int tab_handle, int request_id, const IPC::AutomationURLRequest& request)); MOCK_METHOD3(OnRequestRead, void(int tab_handle, int request_id, 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" |