diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 22:23:18 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 22:23:18 +0000 |
| commit | 031793ff63e1b27ae8ecc1f8ae8ab0d96a6741e3 (patch) | |
| tree | 80473ce7e069867984e4ff63a8d90f23cd49bce3 /chrome_frame | |
| parent | bde74369d3811fd4d0f371112a4361bb3a74f010 (diff) | |
| download | chromium_src-031793ff63e1b27ae8ecc1f8ae8ab0d96a6741e3.zip chromium_src-031793ff63e1b27ae8ecc1f8ae8ab0d96a6741e3.tar.gz chromium_src-031793ff63e1b27ae8ecc1f8ae8ab0d96a6741e3.tar.bz2 | |
Make CF's RefreshContentsUATest test resilient to unexpected favicon loads.
BUG=119233
TEST=chrome_frame_tests.exe RefreshContentsUATest doesn't flake like this anymore
Review URL: http://codereview.chromium.org/9801008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/navigation_test.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index ddb451f..b977d10 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -1161,10 +1161,6 @@ TEST_P(FullTabNavigationTest, RefreshContentsUATest) { } } - EXPECT_CALL(server_mock_, Get(_, testing::StrCaseEq(L"/favicon.ico"), _)) - .Times(testing::AtMost(2)) - .WillRepeatedly(SendFast("HTTP/1.1 404 Not Found", "")); - std::wstring src_url = server_mock_.Resolve(L"/refresh_src.html"); if (in_cf) { |