summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_focus_uitest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 20:55:15 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 20:55:15 +0000
commitc38a190e3c7419b07071525994fdffa53d3d17ab (patch)
treeabbd3c84eb909df631f6098697ead22ff61b5f53 /chrome/browser/browser_focus_uitest.cc
parentea33d1426d1eb857fa99ee21966b040cb6b419f7 (diff)
downloadchromium_src-c38a190e3c7419b07071525994fdffa53d3d17ab.zip
chromium_src-c38a190e3c7419b07071525994fdffa53d3d17ab.tar.gz
chromium_src-c38a190e3c7419b07071525994fdffa53d3d17ab.tar.bz2
Disable flaky FocusOnReloadCrashedTab as it crashes at the end when it fails
TBR=jcivelli@chromium.org, BUG=50025 TEST=none Review URL: http://codereview.chromium.org/3026021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
-rw-r--r--chrome/browser/browser_focus_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 1da4301..de13199 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -755,10 +755,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) {
ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
}
-// FocusOnReloadCrashedTab is flaky on chromium os debug build.
+// FocusOnReloadCrashedTab times out often on chromium os debug build.
// http://crbug.com/50025
#if defined(OS_CHROMEOS) && !defined(NDEBUG)
-#define MAYBE_FocusOnReloadCrashedTab FLAKY_FocusOnReloadCrashedTab
+#define MAYBE_FocusOnReloadCrashedTab DISABLED_FocusOnReloadCrashedTab
#else
#define MAYBE_FocusOnReloadCrashedTab FocusOnReloadCrashedTab
#endif