Run ScopedTaskScheduler tasks synchronously.

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/message_loop/message_loop.h"
 #include "base/run_loop.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_started_(false) {
@@ skipping 38 matching lines @@
   CHECK(!(options_ & IO_MAINLOOP) || !(options_ & REAL_IO_THREAD));
   // There must be a thread to start to use DONT_START_THREADS
   CHECK((options_ & ~IO_MAINLOOP) != DONT_START_THREADS);
 
   if (options_ & IO_MAINLOOP) {
     message_loop_.reset(new base::MessageLoopForIO());
   } else {
     message_loop_.reset(new base::MessageLoopForUI());
   }
 
+  task_scheduler_.reset(

[sky, 2016/12/13 23:24:04]

Use MakeUnique if possible (see thread on chromium-dev).

[gab, 2016/12/14 14:43:17]

It used to but I pushed back on it earlier because code in rest of this method
uses .reset() and I think our style guide prefers to follow nearby code over
every other preference?

+      new base::test::ScopedTaskScheduler(message_loop_.get()));
+
   ui_thread_.reset(
       new TestBrowserThread(BrowserThread::UI, message_loop_.get()));
 
   if (options_ & REAL_DB_THREAD) {
     db_thread_.reset(new TestBrowserThread(BrowserThread::DB));
   } else {
     db_thread_.reset(
         new TestBrowserThread(BrowserThread::DB, message_loop_.get()));
   }
 
@@ skipping 31 matching lines @@
   if (options_ & REAL_FILE_THREAD)
     file_thread_->Start();
 
   if (options_ & REAL_IO_THREAD)
     io_thread_->StartIOThread();
 
   threads_started_ = true;
 }
 
 }  // namespace content