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

content/public/test/test_utils.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 "content/public/test/test_utils.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 297 matching lines @@
 InProcessUtilityThreadHelper::InProcessUtilityThreadHelper()
     : child_thread_count_(0), shell_context_(new TestServiceManagerContext) {
   RenderProcessHost::SetRunRendererInProcess(true);
   BrowserChildProcessObserver::Add(this);
 }
 
 InProcessUtilityThreadHelper::~InProcessUtilityThreadHelper() {
   if (child_thread_count_) {
     DCHECK(BrowserThread::IsMessageLoopValid(BrowserThread::UI));
     DCHECK(BrowserThread::IsMessageLoopValid(BrowserThread::IO));
-    run_loop_.reset(new base::RunLoop);
-    run_loop_->Run();
+    runner_ = new MessageLoopRunner;
+    runner_->Run();
   }
   BrowserChildProcessObserver::Remove(this);
   RenderProcessHost::SetRunRendererInProcess(false);
 }
 
 void InProcessUtilityThreadHelper::BrowserChildProcessHostConnected(
     const ChildProcessData& data) {
   child_thread_count_++;
 }
 
 void InProcessUtilityThreadHelper::BrowserChildProcessHostDisconnected(
     const ChildProcessData& data) {
   if (--child_thread_count_)
     return;
 
-  if (run_loop_)
-    run_loop_->Quit();
+  if (runner_.get())
+    runner_->Quit();
 }
 
 RenderFrameDeletedObserver::RenderFrameDeletedObserver(RenderFrameHost* rfh)
     : WebContentsObserver(WebContents::FromRenderFrameHost(rfh)),
       process_id_(rfh->GetProcess()->GetID()),
       routing_id_(rfh->GetRoutingID()),
       deleted_(false) {}
 
 RenderFrameDeletedObserver::~RenderFrameDeletedObserver() {}
 
@@ skipping 16 matching lines @@
   if (deleted_)
     return;
 
   runner_.reset(new base::RunLoop());
   runner_->Run();
   runner_.reset();
 }
 
 WebContentsDestroyedWatcher::WebContentsDestroyedWatcher(
     WebContents* web_contents)
-    : WebContentsObserver(web_contents) {
+    : WebContentsObserver(web_contents),
+      message_loop_runner_(new MessageLoopRunner) {
   EXPECT_TRUE(web_contents != NULL);
 }
 
-WebContentsDestroyedWatcher::~WebContentsDestroyedWatcher() {
-}
+WebContentsDestroyedWatcher::~WebContentsDestroyedWatcher() {}
 
 void WebContentsDestroyedWatcher::Wait() {
-  run_loop_.Run();
+  message_loop_runner_->Run();
 }
 
 void WebContentsDestroyedWatcher::WebContentsDestroyed() {
-  run_loop_.Quit();
+  message_loop_runner_->Quit();
 }
 
 }  // namespace content