Commit 4a9b79c3 authored by mnissler@chromium.org's avatar mnissler@chromium.org

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
parent 6163e1eb
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "base/test/test_timeouts.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "base/values.h" #include "base/values.h"
#include "base/test/test_timeouts.h"
#include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/browsing_data_remover.h"
#include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h"
...@@ -1632,7 +1632,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelAll) { ...@@ -1632,7 +1632,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelAll) {
EXPECT_TRUE(GetPrerenderContents() == NULL); 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", PrerenderTestURL("files/prerender/prerender_page_with_link.html",
FINAL_STATUS_USED, FINAL_STATUS_USED,
1); 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment