Fix some flaky tests.

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 190 matching lines @@
   command_line->AppendSwitch(switches::kSitePerProcess);
 }
 
 #if defined(OS_ANDROID)
 // Registers content/browser JNI bindings necessary for some types of tests.
 bool RegisterJniForTesting(JNIEnv* env) {
   return content::android::RegisterBrowserJni(env);
 }
 #endif
 
-MessageLoopRunner::MessageLoopRunner()
-    : loop_running_(false),
-      quit_closure_called_(false) {
+MessageLoopRunner::MessageLoopRunner(QuitMode quit_mode)
+    : quit_mode_(quit_mode), loop_running_(false), quit_closure_called_(false) {
 }
 
 MessageLoopRunner::~MessageLoopRunner() = default;
 
 void MessageLoopRunner::Run() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Do not run the message loop if our quit closure has already been called.
   // This helps in scenarios where the closure has a chance to run before
   // we Run explicitly.
   if (quit_closure_called_)
     return;
 
   loop_running_ = true;
   RunThisRunLoop(&run_loop_);
 }
 
 base::Closure MessageLoopRunner::QuitClosure() {
   return base::Bind(&MessageLoopRunner::Quit, this);
 }
 
 void MessageLoopRunner::Quit() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   quit_closure_called_ = true;
 
   // Only run the quit task if we are running the message loop.
   if (loop_running_) {
-    GetQuitTaskForRunLoop(&run_loop_).Run();
+    switch (quit_mode_) {
+      case QuitMode::LOOSE:
+        GetQuitTaskForRunLoop(&run_loop_).Run();
+        break;
+      case QuitMode::IMMEDIATE:
+        run_loop_.Quit();
+        break;
+    }
     loop_running_ = false;
   }
 }
 
 WindowedNotificationObserver::WindowedNotificationObserver(
     int notification_type,
     const NotificationSource& source)
     : seen_(false),
       running_(false),
       source_(NotificationService::AllSources()) {
@@ skipping 129 matching lines @@
 
 void WebContentsDestroyedWatcher::Wait() {
   message_loop_runner_->Run();
 }
 
 void WebContentsDestroyedWatcher::WebContentsDestroyed() {
   message_loop_runner_->Quit();
 }
 
 }  // namespace content