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

chrome/browser/unload_browsertest.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.
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #endif
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 133 matching lines @@
 #endif
     }
   }
 
   void SetUpOnMainThread() override {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
   }
 
-  void CheckTitle(const char* expected_title, bool wait = false) {
-    auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents();
+  void CheckTitle(const char* expected_title) {
     base::string16 expected = base::ASCIIToUTF16(expected_title);
-    base::string16 actual;
-    if (wait)
-      actual = content::TitleWatcher(web_contents, expected).WaitAndGetTitle();
-    else
-      actual = web_contents->GetTitle();
-    EXPECT_EQ(expected, actual);
+    EXPECT_EQ(expected,
+              browser()->tab_strip_model()->GetActiveWebContents()->GetTitle());
   }
 
   void NavigateToDataURL(const char* html_content, const char* expected_title) {
     ui_test_utils::NavigateToURL(
         browser(), GURL(std::string("data:text/html,") + html_content));
     CheckTitle(expected_title);
   }
 
   void NavigateToNolistenersFileTwice() {
     GURL url(net::URLRequestMockHTTPJob::GetMockUrl("title2.html"));
@@ skipping 437 matching lines @@
 // http://crbug.com/86769.
 IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseTabWhenOtherTabHasListener) {
   NavigateToDataURL(CLOSE_TAB_WHEN_OTHER_TAB_HAS_LISTENER, "only_one_unload");
 
   // Simulate a click to force user_gesture to true; if we don't, the resulting
   // popup will be constrained, which isn't what we want to test.
 
   content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_TAB_ADDED,
         content::NotificationService::AllSources());
+  content::WindowedNotificationObserver load_stop_observer(
+      content::NOTIFICATION_LOAD_STOP,
+      content::NotificationService::AllSources());
   content::SimulateMouseClick(
       browser()->tab_strip_model()->GetActiveWebContents(), 0,
       blink::WebMouseEvent::Button::kLeft);
   observer.Wait();
-  // Need to wait for the title, because the initial page (about:blank) can stop
-  // loading before the click handler calls document.write.
-  CheckTitle("popup", true);
+  load_stop_observer.Wait();
+  CheckTitle("popup");
 
   content::WebContentsDestroyedWatcher destroyed_watcher(
       browser()->tab_strip_model()->GetActiveWebContents());
   chrome::CloseTab(browser());
   destroyed_watcher.Wait();
 
   CheckTitle("only_one_unload");
 }
 
 IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListForceCloseNoUnloadListeners) {
@@ skipping 326 matching lines @@
       base::Bind(&UnloadResults::AddSuccess, base::Unretained(&unload_results)),
       base::Bind(&UnloadResults::AddAbort, base::Unretained(&unload_results)),
       true);
   window_observer.Wait();
   EXPECT_EQ(1, unload_results.get_successes());
   EXPECT_EQ(0, unload_results.get_aborts());
 }
 
 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs
 // and multiple windows.