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..4e09140fa260ce3df8983c6ef603454d81cf1fbc 100644
--- a/base/task_scheduler/task.h
+++ b/base/task_scheduler/task.h
@@ -24,7 +24,9 @@ namespace internal {
 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.
+  // expire before the Task runs. If |delay| is non-zero and the shutdown
+  // behavior in |traits| is BLOCK_SHUTDOWN, the shutdown behavior is
+  // automatically changed to SKIP_ON_SHUTDOWN.

[gab, 2016/10/03 16:59:53]

s/changed/adjusted/

[fdoray, 2016/10/03 17:10:15]

Done.

   Task(const tracked_objects::Location& posted_from,
        const Closure& task,
        const TaskTraits& traits,
@@ -32,7 +34,7 @@ struct BASE_EXPORT Task : public PendingTask {
   ~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