Revert of Convert more test helpers to base::RunLoop, fix page title checks.

content/public/test/test_frame_navigation_observer.cc

 // Copyright 2014 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 "content/public/test/test_frame_navigation_observer.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
@@ skipping 14 matching lines @@
 
 }  // namespace
 
 TestFrameNavigationObserver::TestFrameNavigationObserver(
     const ToRenderFrameHost& adapter)
     : WebContentsObserver(
           ToRenderFrameHostImpl(adapter)->delegate()->GetAsWebContents()),
       frame_tree_node_id_(ToRenderFrameHostImpl(adapter)->GetFrameTreeNodeId()),
       navigation_started_(false),
       has_committed_(false),
-      wait_for_commit_(false) {
+      wait_for_commit_(false),
+      message_loop_runner_(
+          new MessageLoopRunner(MessageLoopRunner::QuitMode::IMMEDIATE)) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 TestFrameNavigationObserver::~TestFrameNavigationObserver() {}
 
 void TestFrameNavigationObserver::Wait() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   wait_for_commit_ = false;
-  run_loop_.Run();
+  message_loop_runner_->Run();
 }
 
 void TestFrameNavigationObserver::WaitForCommit() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (has_committed_)
     return;
 
   wait_for_commit_ = true;
-  run_loop_.Run();
+  message_loop_runner_->Run();
 }
 
 void TestFrameNavigationObserver::DidStartProvisionalLoadForFrame(
     RenderFrameHost* render_frame_host,
     const GURL& validated_url,
     bool is_error_page) {
   RenderFrameHostImpl* rfh =
       static_cast<RenderFrameHostImpl*>(render_frame_host);
   if (rfh->frame_tree_node()->frame_tree_node_id() == frame_tree_node_id_) {
     navigation_started_ = true;
     has_committed_ = false;
   }
 }
 
 void TestFrameNavigationObserver::DidCommitProvisionalLoadForFrame(
     RenderFrameHost* render_frame_host,
     const GURL& url,
     ui::PageTransition transition_type) {
   if (!navigation_started_)
     return;
 
   RenderFrameHostImpl* rfh =
       static_cast<RenderFrameHostImpl*>(render_frame_host);
   if (rfh->frame_tree_node()->frame_tree_node_id() != frame_tree_node_id_)
     return;
 
   has_committed_ = true;
   if (wait_for_commit_)
-    run_loop_.Quit();
+    message_loop_runner_->Quit();
 }
 
 void TestFrameNavigationObserver::DidStopLoading() {
   if (!navigation_started_)
     return;
 
   navigation_started_ = false;
-  run_loop_.Quit();
+  message_loop_runner_->Quit();
 }
 
 }  // namespace content