summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-30 07:06:36 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-30 07:06:36 +0000
commitdbefae2c2db09a90c2b9ee4d3ea1a40e580e532e (patch)
tree72c33bbe8c150e276d07a663b735e93393f9ee80
parent684e4a4a496bd0d5965da473aed041988fd48ed7 (diff)
downloadchromium_src-dbefae2c2db09a90c2b9ee4d3ea1a40e580e532e.zip
chromium_src-dbefae2c2db09a90c2b9ee4d3ea1a40e580e532e.tar.gz
chromium_src-dbefae2c2db09a90c2b9ee4d3ea1a40e580e532e.tar.bz2
The FullTabModeIE_WindowOpenInChrome ChromeFrame test should not quit the message loop on receiving the
NewWindow event as it needs to ensure that the new popup window shunted correctly into Chrome. This should ensure that this test passes now. TBR=amit Review URL: http://codereview.chromium.org/548213 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37623 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome_frame/test/chrome_frame_unittests.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc
index 875b30b..2795de5 100644
--- a/chrome_frame/test/chrome_frame_unittests.cc
+++ b/chrome_frame/test/chrome_frame_unittests.cc
@@ -1354,8 +1354,7 @@ TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_WindowOpenInChrome) {
std::string("A")), 0))));
EXPECT_CALL(mock,
- OnNewWindow3(_, _, _, _, _))
- .WillOnce(QUIT_LOOP(loop));
+ OnNewWindow3(_, _, _, _, _));
HRESULT hr = mock.LaunchIEAndNavigate(kChromeFrameFullTabWindowOpenTestUrl);
ASSERT_HRESULT_SUCCEEDED(hr);