Attempt to fix a flaky test

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 554 matching lines @@
   browser()->ShowFindBar();
 
   gfx::Point start_position;
   gfx::Point position;
   bool fully_visible = false;
 
   // Make sure it is open.
   EXPECT_TRUE(GetFindBarWindowInfo(&start_position, &fully_visible));
   EXPECT_TRUE(fully_visible);
 
-  // Search for 'dream' which the Find box is obscuring.
+  // Search for 'Chromium' which the Find box is obscuring.
   int ordinal = 0;
   TabContents* tab = browser()->GetSelectedTabContents();
-  EXPECT_EQ(1, FindInPageWchar(tab, L"dream",
-                               kFwd, kIgnoreCase, &ordinal));
-  EXPECT_EQ(1, ordinal);
+  int index = 0;
+  for (; index < 30; ++index) {

[Paweł Hajdan Jr., 2010/01/21 20:41:55]

nit: Could you make 30 a constant (kIterations)?

+    EXPECT_EQ(30, FindInPageWchar(tab, L"Chromium",
+                                  kFwd, kIgnoreCase, &ordinal));
 
-  // Make sure Find box has moved.
+    // Check the position.
+    EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
+    EXPECT_TRUE(fully_visible);
+
+    // If the Find box has moved then we are done.
+    if (position.x() != start_position.x())
+      break;
+  }
+
+  // We should not have reached the end.
+  ASSERT_GT(30, index);
+
+  // Search backwards once to get the Find box to move back.
+  EXPECT_EQ(30, FindInPageWchar(tab, L"Chromium",
+                                kBack, kIgnoreCase, &ordinal));
+  // Check the position.
   EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
   EXPECT_TRUE(fully_visible);
-  EXPECT_EQ(start_position.y(), position.y());
-  if (start_position.x() == position.x()) {
-    // Failure case. Try to gather more data.
-    std::string debug_msg = "Position check failed once. ";
-
-    // First see if flushing the message loop has any effect.
-    MessageLoop::current()->RunAllPending();
-
-    if (!GetFindBarWindowInfo(&position, &fully_visible)) {
-      debug_msg += "Get failed. ";
-    } else {
-      if (start_position.x() == position.x())
-        debug_msg += "Position check failed again. ";
-      else
-        debug_msg += "They now differ. ";
-    }
-    // Force the failure.
-    EXPECT_STREQ("", debug_msg.c_str());
-  }
-  EXPECT_NE(start_position.x(), position.x());
-
-  // Search for 'Too much' which the Find box is not obscuring.
-  EXPECT_EQ(1, FindInPageWchar(tab, L"Too much",
-                               kFwd, kIgnoreCase, &ordinal));
-  EXPECT_EQ(1, ordinal);
 
   // Make sure Find box has moved back to its original location.
-  EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
-  EXPECT_TRUE(fully_visible);
-  EXPECT_EQ(start_position, position);
+  EXPECT_EQ(position.x(), start_position.x());
 }
 
 // Make sure F3 in a new tab works if Find has previous string to search for.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
                        FindNextInNewTabUsesPrepopulate) {
   HTTPTestServer* server = StartHTTPServer();
 
   // First we navigate to any page.
   GURL url = server->TestServerPageW(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
@@ skipping 171 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"));
 }