Revert of Revert "Revert of Reland: Switch WindowedNotificationObserver to use base::RunLoop....

chrome/browser/ui/views/find_bar_views_interactive_uitest.cc

Index: chrome/browser/ui/views/find_bar_views_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc
index 892670e1f7a2b7926c3f356e53308bdb7fb46a74..46b21878434c17473605f50358548d34a241d330 100644
--- a/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc
+++ b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc
@@ -85,14 +85,6 @@
     return details;
   }
 
-  FindNotificationDetails WaitForFinalFindResult() {
-    while (true) {
-      auto details = WaitForFindResult();
-      if (details.final_update())
-        return details;
-    }
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(FindInPageTest);
 };
@@ -191,28 +183,28 @@
 
   // Clicking the next and previous buttons should not alter the focused view.
   ClickOnView(next_button);
-  EXPECT_EQ(2, WaitForFinalFindResult().active_match_ordinal());
+  EXPECT_EQ(2, WaitForFindResult().active_match_ordinal());
   EXPECT_TRUE(IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
   ClickOnView(previous_button);
-  EXPECT_EQ(1, WaitForFinalFindResult().active_match_ordinal());
+  EXPECT_EQ(1, WaitForFindResult().active_match_ordinal());
   EXPECT_TRUE(IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
   // Tapping the next and previous buttons should not alter the focused view.
   TapOnView(next_button);
-  EXPECT_EQ(2, WaitForFinalFindResult().active_match_ordinal());
+  EXPECT_EQ(2, WaitForFindResult().active_match_ordinal());
   EXPECT_TRUE(IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
   TapOnView(previous_button);
-  EXPECT_EQ(1, WaitForFinalFindResult().active_match_ordinal());
+  EXPECT_EQ(1, WaitForFindResult().active_match_ordinal());
   EXPECT_TRUE(IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
   // The same should be true even when the previous button is focused.
   previous_button->RequestFocus();
   EXPECT_TRUE(IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON));
   ClickOnView(next_button);
-  EXPECT_EQ(2, WaitForFinalFindResult().active_match_ordinal());
+  EXPECT_EQ(2, WaitForFindResult().active_match_ordinal());
   EXPECT_TRUE(IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON));
   TapOnView(next_button);
-  EXPECT_EQ(3, WaitForFinalFindResult().active_match_ordinal());
+  EXPECT_EQ(3, WaitForFindResult().active_match_ordinal());
   EXPECT_TRUE(IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON));
 }