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

chrome/browser/renderer_host/render_process_host_chrome_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.
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/process/process.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 507 matching lines @@
   chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Toggle());
   close_observer.Wait();
 }
 
 // This class's goal is to close the browser window when a renderer process has
 // crashed. It does so by monitoring WebContents for RenderProcessGone event and
 // closing the passed in TabStripModel. This is used in the following test case.
 class WindowDestroyer : public content::WebContentsObserver {
  public:
   WindowDestroyer(content::WebContents* web_contents, TabStripModel* model)
-      : content::WebContentsObserver(web_contents),
-        tab_strip_model_(model),
-        browser_closed_observer_(chrome::NOTIFICATION_BROWSER_CLOSED,
-                                 content::NotificationService::AllSources()) {}
-
-  // Wait for the browser window to be destroyed.
-  void Wait() { browser_closed_observer_.Wait(); }
+      : content::WebContentsObserver(web_contents), tab_strip_model_(model) {}
 
   void RenderProcessGone(base::TerminationStatus status) override {
+    // Wait for the window to be destroyed, which will ensure all other
+    // RenderViewHost objects are deleted before we return and proceed with
+    // the next iteration of notifications.
+    content::WindowedNotificationObserver observer(
+        chrome::NOTIFICATION_BROWSER_CLOSED,
+        content::NotificationService::AllSources());
     tab_strip_model_->CloseAllTabs();
+    observer.Wait();
   }
 
  private:
   TabStripModel* tab_strip_model_;
-  content::WindowedNotificationObserver browser_closed_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowDestroyer);
 };
 
 // Test to ensure that while iterating through all listeners in
 // RenderProcessHost and invalidating them, we remove them properly and don't
 // access already freed objects. See http://crbug.com/255524.
 // Crashes on Win/Linux only.  http://crbug.com/606485.
 #if defined(OS_WIN) || defined(OS_LINUX)
 #define MAYBE_CloseAllTabsDuringProcessDied \
@@ skipping 12 matching lines @@
 
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
 
   WebContents* wc1 = browser()->tab_strip_model()->GetWebContentsAt(0);
   WebContents* wc2 = browser()->tab_strip_model()->GetWebContentsAt(1);
   EXPECT_EQ(wc1->GetRenderProcessHost(), wc2->GetRenderProcessHost());
 
   // Create an object that will close the window on a process crash.
   WindowDestroyer destroyer(wc1, browser()->tab_strip_model());
 
+  content::WindowedNotificationObserver observer(
+      chrome::NOTIFICATION_BROWSER_CLOSED,
+      content::NotificationService::AllSources());
+
   // Kill the renderer process, simulating a crash. This should the ProcessDied
   // method to be called. Alternatively, RenderProcessHost::OnChannelError can
   // be called to directly force a call to ProcessDied.
   wc1->GetRenderProcessHost()->Shutdown(-1, true);
 
-  destroyer.Wait();
+  observer.Wait();
 }
 
 // Sets up the browser in order to start the tests with two tabs open: one
 // called "no audio" in foreground and another called "audio" in background with
 // audio in playing state. Also sets up the variables containing the process
 // associated with each tab, the urls of the two pages and the WebContents of
 // the "audio" page.
 class ChromeRenderProcessHostBackgroundingTest
     : public ChromeRenderProcessHostTest {
  public:
@@ skipping 131 matching lines @@
   WaitUntilBackgrounded(no_audio_process_, false, audio_process_, true);
 
   // Start the audio from the backgrounded tab.
   ASSERT_TRUE(
       content::ExecuteScript(audio_tab_web_contents_,
                              "document.getElementById('audioPlayer').play();"));
 
   // Wait until the two pages are not backgrounded.
   WaitUntilBackgrounded(no_audio_process_, false, audio_process_, false);
 }