diff options
author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 22:18:30 +0000 |
---|---|---|
committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 22:18:30 +0000 |
commit | 89eca17fd5af241a12532ba6f714cb37424c55a4 (patch) | |
tree | 951e2219095b0c55a0e042094e989c5aa9e871af /chrome/browser/errorpage_uitest.cc | |
parent | fc2e0870089a2cf644e29ec14e58f3bc6168e591 (diff) | |
download | chromium_src-89eca17fd5af241a12532ba6f714cb37424c55a4.zip chromium_src-89eca17fd5af241a12532ba6f714cb37424c55a4.tar.gz chromium_src-89eca17fd5af241a12532ba6f714cb37424c55a4.tar.bz2 |
Disable the second Page404 ui_test - first was disabled earlier, this one uses same code path.
R=phajdan.jr
BUG=19361
TEST=none
Review URL: http://codereview.chromium.org/173227
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
-rw-r--r-- | chrome/browser/errorpage_uitest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc index 56a6562..a976f8f 100644 --- a/chrome/browser/errorpage_uitest.cc +++ b/chrome/browser/errorpage_uitest.cc @@ -159,10 +159,11 @@ TEST_F(ErrorPageTest, IFrame404) { #if defined(OS_LINUX) // TODO(phajdan.jr): This test is flaky on Linux, http://crbug.com/19361 -TEST_F(ErrorPageTest, DISABLED_Page404) { -#else -TEST_F(ErrorPageTest, Page404) { +#define Page404 DISABLED_Page404 +#define Page404_GoBack DISABLED_Page404_GoBack #endif + +TEST_F(ErrorPageTest, Page404) { NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"page404.html")); |