diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 03:10:35 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 03:10:35 +0000 |
| commit | b344b8f234e89505e9c7b12c878964e91bed2497 (patch) | |
| tree | d2b2b11244bed76a8e75b96425e594f1e2177d3b /chrome_frame | |
| parent | 8c977e7774b8bf6f809cb6d81d7226f176f5df25 (diff) | |
| download | chromium_src-b344b8f234e89505e9c7b12c878964e91bed2497.zip chromium_src-b344b8f234e89505e9c7b12c878964e91bed2497.tar.gz chromium_src-b344b8f234e89505e9c7b12c878964e91bed2497.tar.bz2 | |
Fix an issue with the ChromeFrame protocol patch which shows up in the NavigationToRestrictedSite test. It appears
that on IE7 we don't receive the NavigateComplete notification. The protocol patch is now active on the IE7 builder
TBR=stoyan
Review URL: http://codereview.chromium.org/2835010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/test_mock_with_web_server.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/test/test_mock_with_web_server.cc b/chrome_frame/test/test_mock_with_web_server.cc index e2e6a1ef..d27691c 100644 --- a/chrome_frame/test/test_mock_with_web_server.cc +++ b/chrome_frame/test/test_mock_with_web_server.cc @@ -1329,7 +1329,8 @@ TEST(IEPrivacy, NavigationToRestrictedSite) { } EXPECT_CALL(mock, OnNavigateComplete2(_, - testing::Field(&VARIANT::bstrVal, testing::StrCaseEq(url)))).Times(1); + testing::Field(&VARIANT::bstrVal, testing::StrCaseEq(url)))) + .Times(testing::AtMost(1)); const char* kAlertDlgCaption = "Security Alert"; EXPECT_CALL(mock, OnWindowDetected(_, testing::StrEq(kAlertDlgCaption))) |