summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 17:47:15 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 17:47:15 +0000
commit22711d6cbe4d4c78d5038071605fcaa07134fa41 (patch)
tree4c9a4fffa359933bb5258ef204d3258c46dd47bc /chrome/browser/autocomplete
parent5750fa2c2356391787e0351f3c6f4789fe6609d7 (diff)
downloadchromium_src-22711d6cbe4d4c78d5038071605fcaa07134fa41.zip
chromium_src-22711d6cbe4d4c78d5038071605fcaa07134fa41.tar.gz
chromium_src-22711d6cbe4d4c78d5038071605fcaa07134fa41.tar.bz2
Mark AutocompleteBrowserTest.FocusSearch flaky on Windows and Linux. (reland)
Use MAYBE_ convention as FocusSearch is a method call in the file as well. TBR=isherman@chromium.org BUG=104307 Review URL: http://codereview.chromium.org/8572015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_browsertest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index ae1cce8..56a0caf 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -170,7 +170,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) {
EXPECT_TRUE(location_bar->location_entry()->IsSelectAll());
}
-IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) {
+#if defined(OS_WIN) || defined(OS_LINUX)
+// http://crbug.com/104307
+#define MAYBE_FocusSearch FLAKY_FocusSearch
+#else
+#define MAYBE_FocusSearch FocusSearch
+#endif
+IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_FocusSearch) {
LocationBar* location_bar = GetLocationBar();
// Focus search when omnibox is blank