Always use an async TaskScheduler in TestBrowserThreadBundle.

content/public/test/test_browser_thread_bundle.cc

 // Copyright 2013 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_browser_thread_bundle.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/scoped_async_task_scheduler.h"
-#include "base/test/scoped_task_scheduler.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/public/test/test_browser_thread.h"
 
 namespace content {
 
 TestBrowserThreadBundle::TestBrowserThreadBundle()
     : TestBrowserThreadBundle(DEFAULT) {}
 
 TestBrowserThreadBundle::TestBrowserThreadBundle(int options)
     : options_(options), threads_created_(false) {
@@ skipping 28 matching lines @@
   base::RunLoop().RunUntilIdle();
   // This is the point at which we normally shut down the thread pool. So flush
   // it again in case any shutdown tasks have been posted to the pool from the
   // threads above.
   BrowserThreadImpl::FlushThreadPoolHelperForTesting();
   base::RunLoop().RunUntilIdle();
   ui_thread_->Stop();
   base::RunLoop().RunUntilIdle();
 
   scoped_async_task_scheduler_.reset();
-  scoped_task_scheduler_.reset();
+
+  base::RunLoop().RunUntilIdle();
 
   // |message_loop_| needs to explicitly go away before fake threads in order
   // for DestructionObservers hooked to |message_loop_| to be able to invoke
   // BrowserThread::CurrentlyOn() -- ref. ~TestBrowserThread().
   CHECK(message_loop_->IsIdleForTesting());
   message_loop_.reset();
 }
 
 void TestBrowserThreadBundle::Init() {
   // Check for conflicting options can't have two IO threads.
@@ skipping 13 matching lines @@
       new TestBrowserThread(BrowserThread::UI, message_loop_.get()));
 
   if (!(options_ & DONT_CREATE_THREADS))
     CreateThreads();
 }
 
 // This method mimics the work done in BrowserMainLoop::CreateThreads().
 void TestBrowserThreadBundle::CreateThreads() {
   DCHECK(!threads_created_);
 
-  if (options_ & REAL_TASK_SCHEDULER) {
-    scoped_async_task_scheduler_ =
-        base::MakeUnique<base::test::ScopedAsyncTaskScheduler>();
-  } else {
-    scoped_task_scheduler_ =
-        base::MakeUnique<base::test::ScopedTaskScheduler>(message_loop_.get());
-  }
+  scoped_async_task_scheduler_ =
+      base::MakeUnique<base::test::ScopedAsyncTaskScheduler>();
 
   if (options_ & REAL_DB_THREAD) {
     db_thread_.reset(new TestBrowserThread(BrowserThread::DB));
     db_thread_->Start();
   } else {
     db_thread_.reset(
         new TestBrowserThread(BrowserThread::DB, message_loop_.get()));
   }
 
   if (options_ & REAL_FILE_THREAD) {
@@ skipping 16 matching lines @@
     io_thread_->StartIOThread();
   } else {
     io_thread_.reset(
         new TestBrowserThread(BrowserThread::IO, message_loop_.get()));
   }
 
   threads_created_ = true;
 }
 
 }  // namespace content