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

chrome/browser/ui/views/find_bar_views_interactive_uitest.cc

 // Copyright (c) 2012 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/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 67 matching lines @@
         browser()->tab_strip_model()->GetActiveWebContents());
     ui_test_utils::WindowedNotificationObserverWithDetails
         <FindNotificationDetails> observer(
             chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, source);
     observer.Wait();
     FindNotificationDetails details;
     EXPECT_TRUE(observer.GetDetailsFor(source.map_key(), &details));
     return details;
   }
 
-  FindNotificationDetails WaitForFinalFindResult() {
-    while (true) {
-      auto details = WaitForFindResult();
-      if (details.final_update())
-        return details;
-    }
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(FindInPageTest);
 };
 
 // Flaky because the test server fails to start? See: http://crbug.com/96594.
 IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   // First we navigate to our test page (tab A).
   GURL url = embedded_test_server()->GetURL(kSimplePage);
@@ skipping 78 matching lines @@
   ASSERT_GE(match_count, 3);
   // Avoid GetViewByID on BrowserView; the find bar is outside its hierarchy.
   FindBarView* find_bar_view = GetFindBarView();
   views::View* next_button =
       find_bar_view->GetViewByID(VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON);
   views::View* previous_button =
       find_bar_view->GetViewByID(VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON);
 
   // 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));
 }
 
 IN_PROC_BROWSER_TEST_F(FindInPageTest, ButtonsDisabledWithoutText) {
   ASSERT_TRUE(embedded_test_server()->Start());
   // Make sure Chrome is in the foreground, otherwise sending input
   // won't do anything and the test will hang.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   // First we navigate to any page.
   ui_test_utils::NavigateToURL(browser(),
@@ skipping 310 matching lines @@
 
   ui_test_utils::UrlLoadObserver observer(
       GURL("about:blank"), content::NotificationService::AllSources());
 
   // Send Ctrl-Enter, should cause navigation to about:blank.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_RETURN, true, false, false, false));
 
   observer.Wait();
 }