diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 23:16:47 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 23:16:47 +0000 |
commit | fe9eb4f9d93a56a26d99fba1d3d3761fd6590fb2 (patch) | |
tree | bb145bf68ee0fef814d5abfbc0ef39151465025a /chrome_frame/test/automation_client_mock.h | |
parent | 07d05acb91a5ab60b7d5f2b71a201f4f896f43ef (diff) | |
download | chromium_src-fe9eb4f9d93a56a26d99fba1d3d3761fd6590fb2.zip chromium_src-fe9eb4f9d93a56a26d99fba1d3d3761fd6590fb2.tar.gz chromium_src-fe9eb4f9d93a56a26d99fba1d3d3761fd6590fb2.tar.bz2 |
Ensure that ChromeFrame link navigations which occur when the opener frame is NULL are
always reported back to the host browser as top level navigations. The other change
is to always send over navigation requests from the automation client even if the
url remains the same if the client is already initialized, i.e this is treated as a new
navigation.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=38456
Bug=38456
Test=The ChromeFrame side of the change is covered by a new chrome frame mock test.
Will add a test for the render view change in a subsequent CL.
Review URL: http://codereview.chromium.org/3235001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/automation_client_mock.h')
-rw-r--r-- | chrome_frame/test/automation_client_mock.h | 6 |
1 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 09b1484..2ac30e8 100644 --- a/chrome_frame/test/automation_client_mock.h +++ b/chrome_frame/test/automation_client_mock.h @@ -105,12 +105,12 @@ class MockAutomationProxy : public ChromeFrameAutomationProxy { }; struct MockAutomationMessageSender : public AutomationMessageSender { - MOCK_METHOD1(Send, bool(IPC::Message*)); + virtual bool Send(IPC::Message* msg) { + return proxy_->Send(msg); + } void ForwardTo(StrictMock<MockAutomationProxy> *p) { proxy_ = p; - ON_CALL(*this, Send(testing::_)) - .WillByDefault(testing::Invoke(proxy_, &MockAutomationProxy::Send)); } StrictMock<MockAutomationProxy>* proxy_; |