Introduce ui_test_utils::FocusView and de-flake OmniboxViewTest.BeginningShownAfterBlur

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 10f517e44e87805e4d44c9b331c2fd5471d1de3f..77346c13911a570fbb82f44832d12bb75302891e 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -1676,13 +1676,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EditSearchEngines) {
   EXPECT_FALSE(omnibox_view->model()->popup_model()->IsOpen());
 }
 
-#if defined(OS_MACOSX)
-// http://crbug.com/406012
-#define MAYBE_BeginningShownAfterBlur DISABLED_BeginningShownAfterBlur
-#else
-#define MAYBE_BeginningShownAfterBlur BeginningShownAfterBlur
-#endif
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BeginningShownAfterBlur) {
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, BeginningShownAfterBlur) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
@@ -1690,18 +1684,18 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BeginningShownAfterBlur) {
   omnibox_view->SetWindowTextAndCaretPos(ASCIIToUTF16("data:text/plain,test"),
       5U, false, false);
   omnibox_view->OnAfterPossibleChange();
-  ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
+  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
   size_t start, end;
   omnibox_view->GetSelectionBounds(&start, &end);
-  ASSERT_EQ(5U, start);
-  ASSERT_EQ(5U, end);
+  EXPECT_EQ(5U, start);
+  EXPECT_EQ(5U, end);
 
-  ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
-  ASSERT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
+  ui_test_utils::FocusView(browser(), VIEW_ID_TAB_CONTAINER);
+  EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
 
   omnibox_view->GetSelectionBounds(&start, &end);
-  ASSERT_EQ(0U, start);
-  ASSERT_EQ(0U, end);
+  EXPECT_EQ(0U, start);
+  EXPECT_EQ(0U, end);
 }
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CtrlArrowAfterArrowSuggestions) {