InstantExtended: update tests for Instant Extended (part 3).
Disable tests that no longer will work with Instant Extended. Most of these are
NTP4 tests that no longer make sense and should be deleted along with the rest
of NTP4 code. There are three actual test failures corresponding to an actual
bug or a bad interaction between the test and Instant Extended (all of these
have bugs filed for them).
(Note that this is split off from http://crrev.com/24733003.)
BUG=297915
Review URL: https://codereview.chromium.org/61003007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234986 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index ecf2a35..8e972da 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -938,14 +938,16 @@
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
+// 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, MAYBE_FocusOnNavigate) {
+IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_FocusOnNavigate) {
// Needed on Mac.
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
// Load the NTP.
