Add REAL_TASK_SCHEDULER option 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/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)
@@ skipping 28 matching lines @@
   db_thread_->Stop();
   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();
 
-  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
   // 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 10 matching lines @@
   ui_thread_.reset(
       new TestBrowserThread(BrowserThread::UI, message_loop_.get()));
 
   if (!(options_ & DONT_CREATE_THREADS))
     CreateThreads();
 }
 
 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(
+        new base::test::ScopedAsyncTaskScheduler());

[robliao, 2017/01/12 20:15:02]

Should Async instead have been an option off of ScopedTaskScheduler?

[fdoray, 2017/01/12 21:25:56]

No. It is very convenient to be able to add a ScopedAsyncTaskScheduler member to
a test fixture instead of a ScopedTaskScheduler member + initialization with a
custom flag in the constructor. It is also easier to find ScopedTaskScheduler
vs. ScopedAsyncTaskSchedulers in code search with different class names.

[robliao, 2017/01/12 21:31:03]

Do we expect many uses of ScopedAsyncTaskScheduler? My reading is that we want
folks to use ScopedTaskScheduler and only used ScopedAsyncTaskScheduler
sparingly.

If that's the case, there are likely going to be very few users of this, so I
would be fine with those folks going through the extra hoop of initializing the
member with the async option in their constructor.

Search should be easy as we can look for the use of the option.

+  } else {
+    scoped_task_scheduler_.reset(
+        new base::test::ScopedTaskScheduler(message_loop_.get()));
+  }
 
   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