Take 2: Disable the test (I accidentally modified the file before checking in...

chrome/browser/views/find_bar_host_browsertest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/find_notification_details.h"
@@ skipping 137 matching lines @@
 std::string FocusedOnPage(TabContents* tab_contents) {
   std::string result;
   ui_test_utils::ExecuteJavaScriptAndExtractString(
       tab_contents->render_view_host(),
       L"",
       L"window.domAutomationController.send(getFocusedElement());",
       &result);
   return result;
 }
 
-// This tests the FindInPage end-state, in other words: what is focused and
-// selected after you close the Find box. For example, if you find within a link
-// the link should be focused, but not selection highlighted. If you find simple
-// text, it should be highlighted when closing the Find box.
+// This tests the FindInPage end-state, in other words: what is focused when you
+// close the Find box (ie. if you find within a link the link should be
+// focused).
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageEndState) {
   HTTPTestServer* server = StartHTTPServer();
 
   // First we navigate to our special focus tracking page.
   GURL url = server->TestServerPageW(kEndState);
   ui_test_utils::NavigateToURL(browser(), url);
 
   TabContents* tab_contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(NULL != tab_contents);
 
   // Verify that nothing has focus.
   ASSERT_STREQ("{nothing focused}", FocusedOnPage(tab_contents).c_str());
 
   // Search for a text that exists within a link on the page.
   int ordinal = 0;
   EXPECT_EQ(1, FindInPageWchar(tab_contents, L"nk",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
 
   // End the find session, which should set focus to the link.
   tab_contents->StopFinding(false);
 
   // Verify that the link is focused.
   EXPECT_STREQ("link1", FocusedOnPage(tab_contents).c_str());
 
-  // Make sure nothing is highlighted (don't want both focus highlighting and
-  // selection highlighting at the same time).
-  std::string result;
-  ui_test_utils::ExecuteJavaScriptAndExtractString(
-      tab_contents->render_view_host(),
-      L"",
-      L"window.domAutomationController.send(window.getSelection().toString());",
-      &result);
-  EXPECT_STREQ("", result.c_str());
-
-  // Search for a text that exists within link2 on the page.
+  // Search for a text that exists within a link on the page.
   EXPECT_EQ(1, FindInPageWchar(tab_contents, L"Google",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
 
   // Move the selection to link 1, after searching.
+  std::string result;
   ui_test_utils::ExecuteJavaScriptAndExtractString(
       tab_contents->render_view_host(),
       L"",
       L"window.domAutomationController.send(selectLink1());",
       &result);
 
   // End the find session.
   tab_contents->StopFinding(false);
 
   // Verify that link2 is not focused.
   EXPECT_STREQ("", FocusedOnPage(tab_contents).c_str());
-
-  // Make sure link1 is still highlighted.
-  ui_test_utils::ExecuteJavaScriptAndExtractString(
-      tab_contents->render_view_host(),
-      L"",
-      L"window.domAutomationController.send(window.getSelection().toString());",
-      &result);
-  EXPECT_STREQ("link", result.c_str());
-
-  // Search for 'This'. Should have 1 match.
-  TabContents* tab = browser()->GetSelectedTabContents();
-  EXPECT_EQ(1, FindInPageWchar(tab, L"This", kFwd, kIgnoreCase, &ordinal));
-  EXPECT_EQ(1, ordinal);
-
-  // End the Find session, thereby making the word 'This' highlighted.
-  browser()->GetFindBarController()->EndFindSession();
-
-  // Make sure 'This' is now highlighted.
-  ui_test_utils::ExecuteJavaScriptAndExtractString(
-      tab->render_view_host(),
-      L"",
-      L"window.domAutomationController.send(window.getSelection().toString());",
-      &result);
-  EXPECT_STREQ("This", result.c_str());
-
-  // Search for something that doesn't exist (or at least not on that page).
-  EXPECT_EQ(0, FindInPageWchar(tab, L"aliens", kFwd, kIgnoreCase, &ordinal));
-  EXPECT_EQ(0, ordinal);
-
-  // End the Find session.
-  browser()->GetFindBarController()->EndFindSession();
-
-  // Make sure nothing is highlighted.
-  ui_test_utils::ExecuteJavaScriptAndExtractString(
-      tab->render_view_host(),
-      L"",
-      L"window.domAutomationController.send(window.getSelection().toString());",
-      &result);
-  EXPECT_STREQ("", result.c_str());
 }
 
 // This test loads a single-frame page and makes sure the ordinal returned makes
 // sense as we FindNext over all the items.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageOrdinal) {
   HTTPTestServer* server = StartHTTPServer();
 
   // First we navigate to our page.
   GURL url = server->TestServerPageW(kFrameData);
   ui_test_utils::NavigateToURL(browser(), url);
@@ skipping 253 matching lines @@
 
   // Search for a text that exists within a link on the page.
   int ordinal = 0;
   EXPECT_EQ(2, FindInPageWchar(tab_contents, L"html ",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
 }
 
 // Make sure Find box disappears on Navigate but not on Refresh.
 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-// The last EXPECT_FALSE(fully_visible) is flaky (especially on
-// 64bit build.). See bug http://crbug.com/28629.
-#define FindDisappearOnNavigate FLAKY_FindDisappearOnNavigate
+// The last EXPECT_FALSE(fully_visible) is failing all the time on
+// the linux_views bot. See bug: http://crbug.com/28629.
+#define FindDisappearOnNavigate DISABLED_FindDisappearOnNavigate
 #endif
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) {
   HTTPTestServer* server = StartHTTPServer();
 
   // First we navigate to our special focus tracking page.
   GURL url = server->TestServerPageW(kSimplePage);
   GURL url2 = server->TestServerPageW(kFramePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Open the Find window with animations disabled.
@@ skipping 297 matching lines @@
   // Find "given".
   FindInPageWchar(tab2, L"given", kFwd, kIgnoreCase, &ordinal);
 
   // Switch back to first tab.
   browser()->SelectTabContentsAt(0, false);
   browser()->GetFindBarController()->EndFindSession();
   // Simulate F3.
   ui_test_utils::FindInPage(tab1, string16(), kFwd, kIgnoreCase, &ordinal);
   EXPECT_EQ(tab1->find_text(), WideToUTF16(L"Default"));
 }