Add CriticalClosure to BLOCK_SHUTDOWN Tasks

base/task_scheduler/task.cc

Index: base/task_scheduler/task.cc
diff --git a/base/task_scheduler/task.cc b/base/task_scheduler/task.cc
index 3780c16dcb71ceff67da3611d4c9c260e641aa76..bf3bbbd5c19d041acc197ac7c114cadcc8f43996 100644
--- a/base/task_scheduler/task.cc
+++ b/base/task_scheduler/task.cc
@@ -4,6 +4,8 @@
 
 #include "base/task_scheduler/task.h"
 
+#include "base/critical_closure.h"
+
 namespace base {
 namespace internal {
 
@@ -11,15 +13,17 @@ Task::Task(const tracked_objects::Location& posted_from,
            const Closure& task,
            const TaskTraits& traits,
            TimeDelta delay)
-    : PendingTask(posted_from,
-                  task,
-                  delay.is_zero() ? TimeTicks() : TimeTicks::Now() + delay,
-                  false),  // Not nestable.
+    : PendingTask(
+          posted_from,
+          traits.shutdown_behavior() == TaskShutdownBehavior::BLOCK_SHUTDOWN
+              ? MakeCriticalClosure(task)
+              : task,
+          delay.is_zero() ? TimeTicks() : TimeTicks::Now() + delay,
+          false),  // Not nestable.
       // Prevent a delayed BLOCK_SHUTDOWN task from blocking shutdown before
       // being scheduled by changing its shutdown behavior to SKIP_ON_SHUTDOWN.
-      traits(!delay.is_zero() &&
-                     traits.shutdown_behavior() ==
-                         TaskShutdownBehavior::BLOCK_SHUTDOWN
+      traits(!delay.is_zero() && traits.shutdown_behavior() ==
+                                     TaskShutdownBehavior::BLOCK_SHUTDOWN
                  ? TaskTraits(traits).WithShutdownBehavior(
                        TaskShutdownBehavior::SKIP_ON_SHUTDOWN)
                  : traits),