Adds ui_test_utils::SendAndWaitForKeyPress and converts callers (where

chrome/browser/views/find_bar_host_interactive_uitest.cc

 // Copyright (c) 2010 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 "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser.h"
@@ skipping 31 matching lines @@
 #elif defined(OS_LINUX)
     gfx::NativeWindow window = browser_window->GetNativeHandle();
     ASSERT_TRUE(window);
     GtkWidget* view = ViewIDUtil::GetWidget(GTK_WIDGET(window), view_id);
 #endif
     ASSERT_TRUE(view);
     ui_controls::MoveMouseToCenterAndPress(view,
                                            ui_controls::LEFT,
                                            ui_controls::DOWN | ui_controls::UP,
                                            new MessageLoop::QuitTask());
-    ui_test_utils::RunMessageLoop();
+    ASSERT_NO_FATAL_FAILURE(ui_test_utils::RunMessageLoop());
   }
 
   int GetFocusedViewID() {
 #if defined(TOOLKIT_VIEWS)
 #if defined(OS_LINUX)
     // See http://crbug.com/26873 .
     views::FocusManager* focus_manager =
         views::FocusManager::GetFocusManagerForNativeView(
             GTK_WIDGET(browser()->window()->GetNativeHandle()));
 #else
@@ skipping 43 matching lines @@
   browser()->Find();
   EXPECT_EQ(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD, GetFocusedViewID());
 
   // Select tab A.
   browser()->SelectTabContentsAt(0, true);
 
   // Close tab B.
   browser()->CloseTabContents(browser()->GetTabContentsAt(1));
 
   // Click on the location bar so that Find box loses focus.
-  ClickOnView(VIEW_ID_LOCATION_BAR);
+  ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_LOCATION_BAR));
 #if defined(TOOLKIT_VIEWS) || defined(OS_WIN)
   // Check the location bar is focused.
   EXPECT_EQ(VIEW_ID_LOCATION_BAR, GetFocusedViewID());
 #endif
 
   // This used to crash until bug 1303709 was fixed.
-  ui_controls::SendKeyPressNotifyWhenDone(
+  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser()->window()->GetNativeHandle(), base::VKEY_ESCAPE,
-      false, false, false, false, new MessageLoop::QuitTask());
-  ui_test_utils::RunMessageLoop();
+      false, false, false, false));
 }
 
 IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestore) {
   ASSERT_TRUE(test_server()->Start());
 
   GURL url = test_server()->GetURL("title1.html");
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Focus the location bar, open and close the find-in-page, focus should
   // return to the location bar.
@@ skipping 43 matching lines @@
   // First we navigate to any page.
   GURL url = test_server()->GetURL(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   gfx::NativeWindow window = browser()->window()->GetNativeHandle();
 
   // Show the Find bar.
   browser()->GetFindBarController()->Show();
 
   // Search for "a".
-  ui_controls::SendKeyPressNotifyWhenDone(window, base::VKEY_A,
-      false, false, false, false,  // No modifiers.
-      new MessageLoop::QuitTask());
-  ui_test_utils::RunMessageLoop();
+  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
+      window, base::VKEY_A, false, false, false, false));  // No modifiers
 
   // We should find "a" here.
   EXPECT_EQ(ASCIIToUTF16("a"), GetFindBarText());
 
   // Delete "a".
-  ui_controls::SendKeyPressNotifyWhenDone(window, base::VKEY_BACK,
-      false, false, false, false,  // No modifiers.
-      new MessageLoop::QuitTask());
-  ui_test_utils::RunMessageLoop();
+  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
+      window, base::VKEY_BACK, false, false, false, false));  // No modifiers.
 
   // Validate we have cleared the text.
   EXPECT_EQ(string16(), GetFindBarText());
 
   // Close the Find box.
-  ui_controls::SendKeyPressNotifyWhenDone(window, base::VKEY_ESCAPE,
-      false, false, false, false,  // No modifiers.
-      new MessageLoop::QuitTask());
-  ui_test_utils::RunMessageLoop();
+  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
+      window, base::VKEY_ESCAPE, false, false, false, false));  // No modifiers.
 
   // Show the Find bar.
   browser()->GetFindBarController()->Show();
 
   // After the Find box has been reopened, it should not have been prepopulated
   // with "a" again.
   EXPECT_EQ(string16(), GetFindBarText());
 
   // Close the Find box.
-  ui_controls::SendKeyPressNotifyWhenDone(window, base::VKEY_ESCAPE,
-      false, false, false, false,  // No modifiers.
-      new MessageLoop::QuitTask());
-  ui_test_utils::RunMessageLoop();
+  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
+      window, base::VKEY_ESCAPE, false, false, false, false));  // No modifiers.
 
   // Press F3 to trigger FindNext.
-  ui_controls::SendKeyPressNotifyWhenDone(window, base::VKEY_F3,
-      false, false, false, false,  // No modifiers.
-      new MessageLoop::QuitTask());
-  ui_test_utils::RunMessageLoop();
+  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
+      window, base::VKEY_F3, false, false, false, false));  // No modifiers.
 
   // After the Find box has been reopened, it should still have no prepopulate
   // value.
   EXPECT_EQ(string16(), GetFindBarText());
 }