summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_focus_uitest.cc
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 15:43:27 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 15:43:27 +0000
commit160f29adc7b6c1fa99f03331aa0bde9334be9578 (patch)
tree54e0354f916f0a472da7c1999e74c6996159d7a4 /chrome/browser/browser_focus_uitest.cc
parentc534b83415c56edd8a69a1fbc3adc7e65210675c (diff)
downloadchromium_src-160f29adc7b6c1fa99f03331aa0bde9334be9578.zip
chromium_src-160f29adc7b6c1fa99f03331aa0bde9334be9578.tar.gz
chromium_src-160f29adc7b6c1fa99f03331aa0bde9334be9578.tar.bz2
Disable FocusOnReloadCrashedTab completely -- it fails on other plaforms, too.
TBR=jcivelli@chromium.org BUG=50025 TEST=none Review URL: http://codereview.chromium.org/4100010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
-rw-r--r--chrome/browser/browser_focus_uitest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 4f6dfa3..9ec19a1 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -760,15 +760,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) {
ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
}
-#if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && !defined(NDEBUG)
-// Hangy, http://crbug.com/50025.
-#define MAYBE_FocusOnReloadCrashedTab DISABLED_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, MAYBE_FocusOnReloadCrashedTab) {
+IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_FocusOnReloadCrashedTab) {
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
ASSERT_TRUE(test_server()->Start());