Add REAL_TASK_SCHEDULER option in TestBrowserThreadBundle.

content/public/test/test_browser_thread_bundle.cc

Index: content/public/test/test_browser_thread_bundle.cc
diff --git a/content/public/test/test_browser_thread_bundle.cc b/content/public/test/test_browser_thread_bundle.cc
index e9251c3fa1b39ee33064fc8ba8965e1ee9ddaf70..4fad692e093aed26235e1204a64461668f2c7c98 100644
--- a/content/public/test/test_browser_thread_bundle.cc
+++ b/content/public/test/test_browser_thread_bundle.cc
@@ -7,6 +7,7 @@
 #include "base/logging.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"
@@ -55,7 +56,8 @@ TestBrowserThreadBundle::~TestBrowserThreadBundle() {
   ui_thread_->Stop();
   base::RunLoop().RunUntilIdle();
 
-  task_scheduler_.reset();
+  scoped_async_task_scheduler_.reset();
+  scoped_task_scheduler_.reset();
 
   // |message_loop_| needs to explicitly go away before fake threads in order
   // for DestructionObservers hooked to |message_loop_| to be able to invoke
@@ -89,8 +91,13 @@ void TestBrowserThreadBundle::Init() {
 void TestBrowserThreadBundle::CreateThreads() {
   DCHECK(!threads_created_);
 
-  task_scheduler_.reset(
-      new base::test::ScopedTaskScheduler(message_loop_.get()));
+  if (options_ & REAL_TASK_SCHEDULER) {
+    scoped_async_task_scheduler_.reset(

[sky, 2017/01/13 15:27:47]

MakeUnique?

[fdoray, 2017/01/13 18:41:00]

Done.

+        new base::test::ScopedAsyncTaskScheduler());
+  } else {
+    scoped_task_scheduler_.reset(
+        new base::test::ScopedTaskScheduler(message_loop_.get()));
+  }
 
   if (options_ & REAL_DB_THREAD) {
     db_thread_.reset(new TestBrowserThread(BrowserThread::DB));