summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/chrome_frame_automation_mock.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-18 22:52:47 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-18 22:52:47 +0000
commit437aa724eacc818379953a76db151d2d79ec7b4d (patch)
tree2021dc6fe13ed3b4a751303c58a9fc01ca13cbc8 /chrome_frame/test/chrome_frame_automation_mock.cc
parentf24de1ccd9217b496383ff222b37deb4c1811963 (diff)
downloadchromium_src-437aa724eacc818379953a76db151d2d79ec7b4d.zip
chromium_src-437aa724eacc818379953a76db151d2d79ec7b4d.tar.gz
chromium_src-437aa724eacc818379953a76db151d2d79ec7b4d.tar.bz2
Fix ChromeFrame test failures on the builder caused by my CL to change the way the automation
launch parameters are propagated to the ChromeFrameAutomationClient object. I also fixed the ChromeFrame automation mock tests which don't use gmock and instead relied on an incorrect behavior in ChromeFrame where we would deny the navigation from the automation client and still navigate in Chrome when the external tab is created. Will work on changing these tests to gmock in a subsequent CL. TBR=stoyan and thanks to him for helping debug the gmock failures. Review URL: http://codereview.chromium.org/500143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/chrome_frame_automation_mock.cc')
-rw-r--r--chrome_frame/test/chrome_frame_automation_mock.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/chrome_frame_automation_mock.cc b/chrome_frame/test/chrome_frame_automation_mock.cc
index d900176..a44c83b 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.cc
+++ b/chrome_frame/test/chrome_frame_automation_mock.cc
@@ -23,7 +23,7 @@ TEST(ChromeFrame, Navigate) {
mock_navigate.NavigateRelativeFile(L"postmessage_basic_frame.html");
loop.Run(NULL);
- EXPECT_EQ(true, mock_navigate.navigation_result());
+ EXPECT_EQ(false, mock_navigate.navigation_result());
}
TEST(ChromeFrame, PostMessage) {
@@ -32,7 +32,7 @@ TEST(ChromeFrame, PostMessage) {
mock_postmessage.NavigateRelativeFile(L"postmessage_basic_frame.html");
loop.Run(NULL);
- EXPECT_EQ(true, mock_postmessage.postmessage_result());
+ EXPECT_EQ(false, mock_postmessage.postmessage_result());
}
TEST(ChromeFrame, RequestStart) {