Update from https://crrev.com/316786

cc/test/ordered_simple_task_runner.h

 // Copyright 2014 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.
 
 #ifndef CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_
 #define CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_
 
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 16 matching lines @@
                            const base::Closure& task,
                            base::TimeTicks post_time,
                            base::TimeDelta delay,
                            TestNestability nestability);
   ~TestOrderablePendingTask();
 
   // operators needed by std::set and comparison
   bool operator==(const TestOrderablePendingTask& other) const;
   bool operator<(const TestOrderablePendingTask& other) const;
 
-  // debug tracing functions
-  scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const;
-  void AsValueInto(base::debug::TracedValue* state) const;
+  // base::trace_event tracing functionality
+  scoped_refptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
+  void AsValueInto(base::trace_event::TracedValue* state) const;
 
  private:
   static size_t task_id_counter;
   const size_t task_id_;
 };
 
 // This runs pending tasks based on task's post_time + delay.
 // We should not execute a delayed task sooner than some of the queued tasks
 // which don't have a delay even though it is queued early.
 class OrderedSimpleTaskRunner : public base::SingleThreadTaskRunner {
@@ skipping 45 matching lines @@
   bool RunPendingTasks();
   // Keep running tasks until no tasks are left.
   // Return code indicates tasks still exist to run which also indicates if
   // runner reached idle.
   bool RunUntilIdle();
   // Keep running tasks until given time period.
   // Return code indicates tasks still exist to run.
   bool RunUntilTime(base::TimeTicks time);
   bool RunForPeriod(base::TimeDelta period);
 
-  // base::debug tracing functionality
-  scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const;
-  virtual void AsValueInto(base::debug::TracedValue* state) const;
+  // base::trace_event tracing functionality
+  scoped_refptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
+  virtual void AsValueInto(base::trace_event::TracedValue* state) const;
 
   // Common conditions to run for, exposed publicly to allow external users to
   // use their own combinations.
   // -------------------------------------------------------------------------
 
   // Keep running until the given number of tasks have run.
   // You generally shouldn't use this check as it will cause your tests to fail
   // when code is changed adding a new task. It is useful as a "timeout" type
   // solution.
   base::Callback<bool(void)> TaskRunCountBelow(size_t max_tasks);
@@ skipping 26 matching lines @@
   bool inside_run_tasks_until_;
   std::set<TestOrderablePendingTask> pending_tasks_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OrderedSimpleTaskRunner);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_