TaskScheduler: Adjust shutdown behavior of delayed tasks.

base/task_scheduler/task.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.h"
 
 namespace base {
 namespace internal {
 
 Task::Task(const tracked_objects::Location& posted_from,
            const Closure& task,
            const TaskTraits& traits,
            const TimeDelta& delay)
     : PendingTask(posted_from,
                   task,
                   delay.is_zero() ? TimeTicks() : TimeTicks::Now() + delay,
                   false),  // Not nestable.
-      traits(traits) {}
+      traits(traits) {
+  // Prevent a delayed BLOCK_SHUTDOWN task from blocking shutdown before being
+  // scheduled by changing its shutdown behavior to SKIP_ON_SHUTDOWN.
+  if (!delay.is_zero() &&
+      traits.shutdown_behavior() == TaskShutdownBehavior::BLOCK_SHUTDOWN) {
+    this->traits.WithShutdownBehavior(TaskShutdownBehavior::SKIP_ON_SHUTDOWN);

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

rm "this->" ?

To avoid naming conflict and make sure you're referring to the right one, I've
previously preferred suffixing the params with "_in" for structs, e.g. :
https://cs.chromium.org/chromium/src/chrome/installer/util/shell_util.h?rcl=0...

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

Done.

+  }
+}
 
 Task::~Task() = default;
 
 }  // namespace internal
 }  // namespace base