TaskScheduler: Remove base::ExecutionMode.

base/task_scheduler/task_tracker.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_tracker.h"
 
 #include <limits>
 
 #include "base/callback.h"
 #include "base/debug/task_annotator.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/sequence_token.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
 
 namespace base {
 namespace internal {
 
 namespace {
 
+constexpr char kParallelExecutionMode[] = "parallel";
+constexpr char kSequencedExecutionMode[] = "sequenced";
+constexpr char kSingleThreadExecutionMode[] = "single thread";
+
 // An immutable copy of a scheduler task's info required by tracing.
 class TaskTracingInfo : public trace_event::ConvertableToTraceFormat {
  public:
   TaskTracingInfo(const TaskTraits& task_traits,
-                  ExecutionMode execution_mode,
+                  const char* execution_mode,
                   const SequenceToken& sequence_token)
       : task_traits_(task_traits),
         execution_mode_(execution_mode),
         sequence_token_(sequence_token) {}
 
   // trace_event::ConvertableToTraceFormat implementation.
   void AppendAsTraceFormat(std::string* out) const override;
 
  private:
   const TaskTraits task_traits_;
-  const ExecutionMode execution_mode_;
+  const char* execution_mode_;

[gab, 2016/10/31 19:10:11]

const char* const

[fdoray, 2016/10/31 19:44:52]

Done.

   const SequenceToken sequence_token_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskTracingInfo);
 };
 
 void TaskTracingInfo::AppendAsTraceFormat(std::string* out) const {
   DictionaryValue dict;
 
   dict.SetString("task_priority",
                  base::TaskPriorityToString(task_traits_.priority()));
-  dict.SetString("execution_mode",
-                 base::ExecutionModeToString(execution_mode_));
-  if (execution_mode_ != ExecutionMode::PARALLEL)
+  dict.SetString("execution_mode", execution_mode_);
+  if (execution_mode_ != kParallelExecutionMode)
     dict.SetInteger("sequence_token", sequence_token_.ToInternalValue());
 
   std::string tmp;
   JSONWriter::Write(dict, &tmp);
   out->append(tmp);
 }
 
 const char kQueueFunctionName[] = "base::PostTask";
 
 // This name conveys that a Task is run by the task scheduler without revealing
@@ skipping 169 matching lines @@
       if (task->sequenced_task_runner_ref) {
         sequenced_task_runner_handle.reset(
             new SequencedTaskRunnerHandle(task->sequenced_task_runner_ref));
       } else if (task->single_thread_task_runner_ref) {
         single_thread_task_runner_handle.reset(
             new ThreadTaskRunnerHandle(task->single_thread_task_runner_ref));
       }
 
       TRACE_TASK_EXECUTION(kRunFunctionName, *task);
 
-      const ExecutionMode execution_mode =
+      const char* execution_mode =

[gab, 2016/10/31 19:10:11]

const char* const

[fdoray, 2016/10/31 19:44:52]

Done.

           task->single_thread_task_runner_ref
-              ? ExecutionMode::SINGLE_THREADED
-              : (task->sequenced_task_runner_ref ? ExecutionMode::SEQUENCED
-                                                 : ExecutionMode::PARALLEL);
+              ? kSingleThreadExecutionMode
+              : (task->sequenced_task_runner_ref ? kSequencedExecutionMode
+                                                 : kParallelExecutionMode);
       // TODO(gab): In a better world this would be tacked on as an extra arg
       // to the trace event generated above. This is not possible however until
       // http://crbug.com/652692 is resolved.
       TRACE_EVENT1("task_scheduler", "TaskTracker::RunTask", "task_info",
                    MakeUnique<TaskTracingInfo>(task->traits, execution_mode,
                                                sequence_token));
 
       PerformRunTask(std::move(task));
     }
 
@@ skipping 178 matching lines @@
       subtle::NoBarrier_AtomicIncrement(&num_pending_undelayed_tasks_, -1);
   DCHECK_GE(new_num_pending_undelayed_tasks, 0);
   if (new_num_pending_undelayed_tasks == 0) {
     AutoSchedulerLock auto_lock(flush_lock_);
     flush_cv_->Signal();
   }
 }
 
 }  // namespace internal
 }  // namespace base