diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 14:33:07 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 14:33:07 +0000 |
| commit | 4a9b79c335031cff67ebd43e48369e3c1ca3215f (patch) | |
| tree | 5a79a80d3132abc3b39ede38ca39977dafc8d218 /chrome/browser/prerender | |
| parent | 6163e1eb2d77514f3e9467a9ff1b9a5852027521 (diff) | |
| download | chromium_src-4a9b79c335031cff67ebd43e48369e3c1ca3215f.zip chromium_src-4a9b79c335031cff67ebd43e48369e3c1ca3215f.tar.gz chromium_src-4a9b79c335031cff67ebd43e48369e3c1ca3215f.tar.bz2 | |
Disable PrerenderBrowserTest.BackToPrerenderedPage on win, it times out.
BUG=92478
TEST=
TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/7622010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender')
| -rw-r--r-- | chrome/browser/prerender/prerender_browsertest.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index a692751..528aa70 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -7,9 +7,9 @@ #include "base/command_line.h" #include "base/path_service.h" #include "base/string_util.h" +#include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "base/test/test_timeouts.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/favicon/favicon_tab_helper.h" @@ -1632,7 +1632,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelAll) { EXPECT_TRUE(GetPrerenderContents() == NULL); } -IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, BackToPrerenderedPage) { +// Flaky on windows: http://crbug.com/92478 +#if defined(OS_WIN) +#define MAYBE_BackToPrerenderedPage DISABLED_BackToPrerenderedPage +#else +#define MAYBE_BackToPrerenderedPage BackToPrerenderedPage +#endif + +IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_BackToPrerenderedPage) { PrerenderTestURL("files/prerender/prerender_page_with_link.html", FINAL_STATUS_USED, 1); |