diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 21:43:55 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 21:43:55 +0000 |
| commit | 47af65f00a6d9606b6d31a09e4562d59a83f2598 (patch) | |
| tree | 486879c031214c2126dd750c8638c4d745198a84 /chrome_frame/cfproxy_test.cc | |
| parent | e027da19eb4b219f44a19ffae90c33e77ed06a34 (diff) | |
| download | chromium_src-47af65f00a6d9606b6d31a09e4562d59a83f2598.zip chromium_src-47af65f00a6d9606b6d31a09e4562d59a83f2598.tar.gz chromium_src-47af65f00a6d9606b6d31a09e4562d59a83f2598.tar.bz2 | |
Reapply part of r64637, which caused mysterious failures on mac waterfall.
This applies only the rename of IPC::ContextMenuParams to
IPC::MiniContextMenuParams so that it doesn't conflict with ::ContextMenuParams
(defined in webkit). This is about half the original patch.
BUG=51409
TEST=compiles
Review URL: http://codereview.chromium.org/4669005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/cfproxy_test.cc')
| -rw-r--r-- | chrome_frame/cfproxy_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/cfproxy_test.cc b/chrome_frame/cfproxy_test.cc index 5b2937c..6a547f8 100644 --- a/chrome_frame/cfproxy_test.cc +++ b/chrome_frame/cfproxy_test.cc @@ -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)); // @@ -486,7 +486,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, |