Flush TaskScheduler in content::RunAllBlockingPoolTasksUntilIdle().

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"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/common/url_schemes.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 126 matching lines @@
       thread_id, FROM_HERE,
       base::Bind(&DeferredQuitRunLoop, post_quit_run_loop_to_ui_thread,
                  kNumQuitDeferrals));
   RunThisRunLoop(&run_loop);
 }
 
 void RunAllBlockingPoolTasksUntilIdle() {
   while (true) {
     content::BrowserThread::GetBlockingPool()->FlushForTesting();
 
+    // Setup a task observer to determine if MessageLoop tasks run in the
+    // current loop iteration. This must be done before
+    // TaskScheduler::FlushForTesting() since this may spin the MessageLoop.
     TaskObserver task_observer;
     base::MessageLoop::current()->AddTaskObserver(&task_observer);
+
+    // Since all blocking pool call sites are being migrated to TaskScheduler,
+    // flush TaskScheduler in addition to the blocking pool.
+    base::TaskScheduler::GetInstance()->FlushForTesting();
+
     base::RunLoop().RunUntilIdle();
     base::MessageLoop::current()->RemoveTaskObserver(&task_observer);
 
     if (!task_observer.processed())
       break;
   }
 }
 
 base::Closure GetDeferredQuitTaskForRunLoop(base::RunLoop* run_loop) {
   return base::Bind(&DeferredQuitRunLoop, run_loop->QuitClosure(),
@@ skipping 214 matching lines @@
 
 void WebContentsDestroyedWatcher::Wait() {
   run_loop_.Run();
 }
 
 void WebContentsDestroyedWatcher::WebContentsDestroyed() {
   run_loop_.Quit();
 }
 
 }  // namespace content