Add TaskTraits::MayBlock and TaskTraits::WithSyncPrimitives.

base/task_scheduler/task_traits.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_traits.h"
 
 #include <stddef.h>
 
 #include <ostream>
 
 #include "base/logging.h"
 #include "base/task_scheduler/scoped_set_task_priority_for_current_thread.h"
 
 namespace base {
 
 // Do not rely on defaults hard-coded below beyond the guarantees described in
 // the header; anything else is subject to change. Tasks should explicitly
 // request defaults if the behavior is critical to the task.

[gab, 2016/12/19 20:20:14]

Move this comment and member initialization to members in header (only keep =
default constructor here).

[fdoray, 2016/12/19 21:22:43]

Unfortunately, these is an include cycle if I include
scoped_set_task_priority_for_current_thread.h in task_traits.h

 TaskTraits::TaskTraits()
-    : with_file_io_(false),
-      with_wait_(false),
+    : may_block_(false),
+      with_sync_primitives_(false),
       priority_(internal::GetTaskPriorityForCurrentThread()),
       shutdown_behavior_(TaskShutdownBehavior::SKIP_ON_SHUTDOWN) {}
 
 TaskTraits::~TaskTraits() = default;
 
-TaskTraits& TaskTraits::WithFileIO() {
-  with_file_io_ = true;
+TaskTraits& TaskTraits::MayBlock() {
+  may_block_ = true;
   return *this;
 }
 
+TaskTraits& TaskTraits::WithSyncPrimitives() {
+  with_sync_primitives_ = true;
+  return *this;
+}
+
+TaskTraits& TaskTraits::WithFileIO() {
+  return MayBlock();
+}
+
 TaskTraits& TaskTraits::WithWait() {
-  with_wait_ = true;
-  return *this;
+  return MayBlock().WithSyncPrimitives();
 }
 
 TaskTraits& TaskTraits::WithPriority(TaskPriority priority) {
   priority_ = priority;
   return *this;
 }
 
 TaskTraits& TaskTraits::WithShutdownBehavior(
     TaskShutdownBehavior shutdown_behavior) {
   shutdown_behavior_ = shutdown_behavior;
@@ skipping 32 matching lines @@
   return os;
 }
 
 std::ostream& operator<<(std::ostream& os,
                          const TaskShutdownBehavior& shutdown_behavior) {
   os << TaskShutdownBehaviorToString(shutdown_behavior);
   return os;
 }
 
 }  // namespace base