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 15:40:41 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 15:40:41 +0000
commit517d2fe72fd3e3ea3022279aab7e391be75804cf (patch)
treec2eb1da8f7639471617a14d481aea2f54ac16a2f /chrome/browser/browser_focus_uitest.cc
parent14d5e6acc2c56022b8c74d18f9f953f1e1b4d453 (diff)
downloadchromium_src-517d2fe72fd3e3ea3022279aab7e391be75804cf.zip
chromium_src-517d2fe72fd3e3ea3022279aab7e391be75804cf.tar.gz
chromium_src-517d2fe72fd3e3ea3022279aab7e391be75804cf.tar.bz2
Mark BrowserFocusTest.FocusOnReloadCrashedTab flaky for chromeos debug build
TBR=jcivelli@chromium.org BUG=50025 TEST=none Review URL: http://codereview.chromium.org/2878049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
-rw-r--r--chrome/browser/browser_focus_uitest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 1dad0de..1da4301 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -755,8 +755,16 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) {
ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
}
+// FocusOnReloadCrashedTab is flaky on chromium os debug build.
+// http://crbug.com/50025
+#if defined(OS_CHROMEOS) && !defined(NDEBUG)
+#define MAYBE_FocusOnReloadCrashedTab FLAKY_FocusOnReloadCrashedTab
+#else
+#define MAYBE_FocusOnReloadCrashedTab FocusOnReloadCrashedTab
+#endif
+
// Tests that focus goes where expected when using reload on a crashed tab.
-IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReloadCrashedTab) {
+IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusOnReloadCrashedTab) {
HTTPTestServer* server = StartHTTPServer();
// Open a regular page, crash, reload.