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/cfproxy_test.cc | |
| 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/cfproxy_test.cc')
| -rw-r--r-- | chrome_frame/cfproxy_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/cfproxy_test.cc b/chrome_frame/cfproxy_test.cc index 28ba8c6..a8c69f3 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" @@ -73,7 +73,7 @@ struct MockChromeProxyDelegate : public ChromeProxyDelegate { // Misc. UI. MOCK_METHOD1(HandleAccelerator, void(const MSG& accel_message)); MOCK_METHOD3(HandleContextMenu, void(HANDLE menu_handle, int align_flags, - const IPC::ContextMenuParams& params)); + const IPC::MiniContextMenuParams& params)); MOCK_METHOD1(TabbedOut, void(bool reverse)); // @@ -472,7 +472,7 @@ TEST(Deserialize, DispatchTabMessage) { EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m9)); // Tuple4<int, HANDLE, int, IPC::ContextMenuParams> - IPC::ContextMenuParams ctxmenu = { 711, 512, GURL("http://link_src"), + IPC::MiniContextMenuParams ctxmenu = { 711, 512, GURL("http://link_src"), GURL("http://unfiltered_link_url"), GURL("http://src_url"), GURL("http://page_url"), GURL("http://frame_url") }; AutomationMsg_ForwardContextMenuToExternalHost m10(0, 1, HANDLE(7), 4, |