TaskScheduler: Adjust shutdown behavior of delayed tasks.

base/task_scheduler/task.h

Index: base/task_scheduler/task.h
diff --git a/base/task_scheduler/task.h b/base/task_scheduler/task.h
index 2b53c690fddffc752ce63ec98b900a0b34f06674..ee9f7a4c23636e84c3508e96725f28a62c90b117 100644
--- a/base/task_scheduler/task.h
+++ b/base/task_scheduler/task.h
@@ -23,16 +23,18 @@ namespace internal {
 // profiling inherited from PendingTask.
 struct BASE_EXPORT Task : public PendingTask {
   // |posted_from| is the site the task was posted from. |task| is the closure
-  // to run. |traits| is metadata about the task. |delay| is a delay that must
-  // expire before the Task runs.
+  // to run. |traits_in| is metadata about the task. |delay| is a delay that
+  // must expire before the Task runs. If |delay| is non-zero and the shutdown
+  // behavior in |traits| is BLOCK_SHUTDOWN, the shutdown behavior is
+  // automatically adjusted to SKIP_ON_SHUTDOWN.
   Task(const tracked_objects::Location& posted_from,
        const Closure& task,
-       const TaskTraits& traits,
+       const TaskTraits& traits_in,
        const TimeDelta& delay);
   ~Task();
 
   // The TaskTraits of this task.
-  const TaskTraits traits;
+  TaskTraits traits;
 
   // The time at which the task was inserted in its sequence. For an undelayed
   // task, this happens at post time. For a delayed task, this happens some