summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 14:13:06 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 14:13:06 +0000
commitee54f4dbd402350728341482f8a599babfc53c4e (patch)
treebb2fc250e401522f3d72aa05329fc07d51ebf4e3
parent0a985775617f2fae8aa94fda137abd8ec8eab223 (diff)
downloadchromium_src-ee54f4dbd402350728341482f8a599babfc53c4e.zip
chromium_src-ee54f4dbd402350728341482f8a599babfc53c4e.tar.gz
chromium_src-ee54f4dbd402350728341482f8a599babfc53c4e.tar.bz2
Marking FindNextInNewTabUsesPrepopulate flaky on Windows due to occasional timeout.
BUG=88316,43070 TEST=browser_tests TBR=robertshield@chromium.org Review URL: http://codereview.chromium.org/7452022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93189 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/find_bar/find_bar_host_browsertest.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index 921f577..179cf93 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -694,12 +694,20 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindMovesWhenObscuring) {
#if defined(OS_MACOSX)
// FindNextInNewTabUsesPrepopulate times-out, at least on Mac.
// See http://crbug.com/43070
-#define FindNextInNewTabUsesPrepopulate DISABLED_FindNextInNewTabUsesPrepopulate
+#define MAYBE_FindNextInNewTabUsesPrepopulate \
+ DISABLED_FindNextInNewTabUsesPrepopulate
+#elif defined (OS_WINDOWS)
+// Occasionally times-out on Windows, too.
+// See http://crbug.com/43070 and http://crbug.com/88316
+#define MAYBE_FindNextInNewTabUsesPrepopulate \
+ FLAKY_FindNextInNewTabUsesPrepopulate
+#else
+#define MAYBE_FindNextInNewTabUsesPrepopulate FindNextInNewTabUsesPrepopulate
#endif
// Make sure F3 in a new tab works if Find has previous string to search for.
IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
- FindNextInNewTabUsesPrepopulate) {
+ MAYBE_FindNextInNewTabUsesPrepopulate) {
ASSERT_TRUE(test_server()->Start());
// First we navigate to any page.