summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 23:36:26 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 23:36:26 +0000
commit2331b71eeed6dc1a1dfc1d0656c0ec7e7d314fcb (patch)
tree8bb231317c680a23a338cde59f598d842f3bb0e9 /chrome_frame
parent15e4d5b043a37988f7e82e8b00287d90acf8787e (diff)
downloadchromium_src-2331b71eeed6dc1a1dfc1d0656c0ec7e7d314fcb.zip
chromium_src-2331b71eeed6dc1a1dfc1d0656c0ec7e7d314fcb.tar.gz
chromium_src-2331b71eeed6dc1a1dfc1d0656c0ec7e7d314fcb.tar.bz2
An attempt to fix the flakiness with the ChromeFrame Javascript window open test on IE9.
We receive multiple NavigateComplete notifications at times. BUG=none TEST=none Review URL: http://codereview.chromium.org/5703005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/mock_ie_event_sink_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/mock_ie_event_sink_test.cc b/chrome_frame/test/mock_ie_event_sink_test.cc
index 2f48ffa..d21635c 100644
--- a/chrome_frame/test/mock_ie_event_sink_test.cc
+++ b/chrome_frame/test/mock_ie_event_sink_test.cc
@@ -94,7 +94,7 @@ ExpectationSet MockIEEventSink::ExpectNavigationCardinality(
void MockIEEventSink::ExpectNavigation(bool is_cf, const std::wstring& url) {
InSequence expect_in_sequence_for_scope;
- if (is_cf) {
+ if (is_cf || GetInstalledIEVersion() == IE_9) {
ExpectNavigationCardinality(url, Exactly(1), testing::Between(1, 2));
} else {
ExpectNavigationCardinality(url, Exactly(1), Exactly(1));