TaskScheduler: Add TaskTraits::WithWait().

base/task_scheduler/task_tracker.cc

 // Copyright 2016 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 "base/task_scheduler/task_tracker.h"
 
 #include <limits>
 
 #include "base/callback.h"
 #include "base/debug/task_annotator.h"
@@ skipping 207 matching lines @@
   const bool can_run_task = BeforeRunTask(shutdown_behavior);
   const bool is_delayed = !task->delayed_run_time.is_null();
 
   if (can_run_task) {
     const bool previous_singleton_allowed =
         ThreadRestrictions::SetSingletonAllowed(
             task->traits.shutdown_behavior() !=
             TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN);
     const bool previous_io_allowed =
         ThreadRestrictions::SetIOAllowed(task->traits.with_file_io());
+    const bool previous_wait_allowed =
+        ThreadRestrictions::SetWaitAllowed(task->traits.with_wait());
 
     {
       // Set up SequenceToken as expected for the scope of the task.
       ScopedSetSequenceTokenForCurrentThread
           scoped_set_sequence_token_for_current_thread(sequence_token);
 
       // Set up TaskRunnerHandle as expected for the scope of the task.
       std::unique_ptr<SequencedTaskRunnerHandle> sequenced_task_runner_handle;
       std::unique_ptr<ThreadTaskRunnerHandle> single_thread_task_runner_handle;
       DCHECK(!task->sequenced_task_runner_ref ||
@@ skipping 18 matching lines @@
       // http://crbug.com/652692 is resolved.
       TRACE_EVENT1("task_scheduler", "TaskTracker::RunTask", "task_info",
                    MakeUnique<TaskTracingInfo>(task->traits, execution_mode,
                                                sequence_token));
 
       PerformRunTask(std::move(task));
     }
 
     ThreadRestrictions::SetSingletonAllowed(previous_singleton_allowed);
     ThreadRestrictions::SetIOAllowed(previous_io_allowed);
+    ThreadRestrictions::SetWaitAllowed(previous_wait_allowed);

[robliao, 2016/11/28 20:09:50]

Nit: Order above SetIOAllowed for symmetry. We should probably do the same with
SetSingletonAllowed.

[fdoray, 2016/11/28 21:47:51]

Done.

 
     AfterRunTask(shutdown_behavior);
   }
 
   if (!is_delayed)
     DecrementNumPendingUndelayedTasks();
 
   return can_run_task;
 }
 
@@ skipping 169 matching lines @@
       subtle::NoBarrier_AtomicIncrement(&num_pending_undelayed_tasks_, -1);
   DCHECK_GE(new_num_pending_undelayed_tasks, 0);
   if (new_num_pending_undelayed_tasks == 0) {
     AutoSchedulerLock auto_lock(flush_lock_);
     flush_cv_->Signal();
   }
 }
 
 }  // namespace internal
 }  // namespace base