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

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 286 matching lines @@
     int notification_type,
     const NotificationSource& source) {
   registrar_.Add(this, notification_type, source);
 }
 
 void WindowedNotificationObserver::Wait() {
   if (seen_)
     return;
 
   running_ = true;
-  run_loop_.reset(new base::RunLoop);
-  run_loop_->Run();
+  message_loop_runner_ = new MessageLoopRunner;
+  message_loop_runner_->Run();
   EXPECT_TRUE(seen_);
 }
 
 void WindowedNotificationObserver::Observe(
     int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   source_ = source;
   details_ = details;
   if (!callback_.is_null() && !callback_.Run(source, details))
     return;
 
   seen_ = true;
   if (!running_)
     return;
 
-  run_loop_->Quit();
+  message_loop_runner_->Quit();
   running_ = false;
 }
 
 InProcessUtilityThreadHelper::InProcessUtilityThreadHelper()
     : child_thread_count_(0), shell_context_(new TestServiceManagerContext) {
   RenderProcessHost::SetRunRendererInProcess(true);
   BrowserChildProcessObserver::Add(this);
 }
 
 InProcessUtilityThreadHelper::~InProcessUtilityThreadHelper() {
@@ skipping 64 matching lines @@
 
 void WebContentsDestroyedWatcher::Wait() {
   run_loop_.Run();
 }
 
 void WebContentsDestroyedWatcher::WebContentsDestroyed() {
   run_loop_.Quit();
 }
 
 }  // namespace content