diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-13 00:22:24 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-13 00:22:24 +0000 |
| commit | 48dcbfb10b992a02e768c646319d3a62cc4e0697 (patch) | |
| tree | 2f8f6c924997493939d80bb62942a0381a53c352 /chrome | |
| parent | 56242e260951820da9f96b7ac354dc6f6b18f3e6 (diff) | |
| download | chromium_src-48dcbfb10b992a02e768c646319d3a62cc4e0697.zip chromium_src-48dcbfb10b992a02e768c646319d3a62cc4e0697.tar.gz chromium_src-48dcbfb10b992a02e768c646319d3a62cc4e0697.tar.bz2 | |
Webkit update to 53151.
TBR=atwilson
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/546020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36069 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/errorpage_uitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc index 6c1f34f..174ffc1 100644 --- a/chrome/browser/errorpage_uitest.cc +++ b/chrome/browser/errorpage_uitest.cc @@ -52,7 +52,7 @@ TEST_F(ErrorPageTest, FLAKY_DNSError_GoBack1) { } // Flaky, http://crbug.com/19361. -TEST_F(ErrorPageTest, FLAKY_DNSError_GoBack2) { +TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2) { // Test that a DNS error occuring in the main frame does not result in an // additional session history entry. GURL test_url(URLRequestFailedDnsJob::kTestUrl); @@ -76,7 +76,7 @@ TEST_F(ErrorPageTest, FLAKY_DNSError_GoBack2) { } // Flaky, http://crbug.com/19361. -TEST_F(ErrorPageTest, FLAKY_DNSError_GoBack2AndForward) { +TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2AndForward) { // Test that a DNS error occuring in the main frame does not result in an // additional session history entry. @@ -104,7 +104,7 @@ TEST_F(ErrorPageTest, FLAKY_DNSError_GoBack2AndForward) { } // Flaky, http://crbug.com/19361. -TEST_F(ErrorPageTest, FLAKY_DNSError_GoBack2Forward2) { +TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2Forward2) { // Test that a DNS error occuring in the main frame does not result in an // additional session history entry. |