| Index: chrome/browser/ui/browser_focus_uitest.cc
|
| diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
|
| index ecf2a3596464efae7a2e7cd121d2dd4976a3d767..8e972da23a4eb64798892d66e0c3741e400ce831 100644
|
| --- a/chrome/browser/ui/browser_focus_uitest.cc
|
| +++ b/chrome/browser/ui/browser_focus_uitest.cc
|
| @@ -938,14 +938,16 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest,
|
| EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
|
| }
|
|
|
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
|
| -// TODO(erg): http://crbug.com/163931
|
| -#define MAYBE_FocusOnNavigate DISABLED_FocusOnNavigate
|
| -#else
|
| -#define MAYBE_FocusOnNavigate FocusOnNavigate
|
| -#endif
|
| -
|
| -IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusOnNavigate) {
|
| +// This functionality is currently broken. http://crbug.com/304865.
|
| +//
|
| +//#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
|
| +//// TODO(erg): http://crbug.com/163931
|
| +//#define MAYBE_FocusOnNavigate DISABLED_FocusOnNavigate
|
| +//#else
|
| +//#define MAYBE_FocusOnNavigate FocusOnNavigate
|
| +//#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_FocusOnNavigate) {
|
| // Needed on Mac.
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
| // Load the NTP.
|
|
|