Update from https://crrev.com/316786

cc/test/ordered_simple_task_runner.cc

 // 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.
 
 #include "cc/test/ordered_simple_task_runner.h"
 
 #include <limits>
 #include <set>
 #include <sstream>
 #include <string>
@@ skipping 42 matching lines @@
     const TestOrderablePendingTask& other) const {
   if (*this == other)
     return false;
 
   if (GetTimeToRun() == other.GetTimeToRun()) {
     return task_id_ < other.task_id_;
   }
   return ShouldRunBefore(other);
 }
 
-scoped_refptr<base::debug::ConvertableToTraceFormat>
+scoped_refptr<base::trace_event::ConvertableToTraceFormat>
 TestOrderablePendingTask::AsValue() const {
-  scoped_refptr<base::debug::TracedValue> state =
-      new base::debug::TracedValue();
+  scoped_refptr<base::trace_event::TracedValue> state =
+      new base::trace_event::TracedValue();
   AsValueInto(state.get());
   return state;
 }
 
 void TestOrderablePendingTask::AsValueInto(
-    base::debug::TracedValue* state) const {
+    base::trace_event::TracedValue* state) const {
   state->SetInteger("id", task_id_);
   state->SetInteger("run_at", GetTimeToRun().ToInternalValue());
   state->SetString("posted_from", location.ToString());
 }
 
 OrderedSimpleTaskRunner::OrderedSimpleTaskRunner()
     : advance_now_(true),
       now_src_(TestNowSource::Create(0)),
       inside_run_tasks_until_(false) {
 }
@@ skipping 165 matching lines @@
     now_src_->SetNow(time);
   }
 
   return result;
 }
 
 bool OrderedSimpleTaskRunner::RunForPeriod(base::TimeDelta period) {
   return RunUntilTime(now_src_->Now() + period);
 }
 
-// base::debug tracing functionality
-scoped_refptr<base::debug::ConvertableToTraceFormat>
+// base::trace_event tracing functionality
+scoped_refptr<base::trace_event::ConvertableToTraceFormat>
 OrderedSimpleTaskRunner::AsValue() const {
-  scoped_refptr<base::debug::TracedValue> state =
-      new base::debug::TracedValue();
+  scoped_refptr<base::trace_event::TracedValue> state =
+      new base::trace_event::TracedValue();
   AsValueInto(state.get());
   return state;
 }
 
 void OrderedSimpleTaskRunner::AsValueInto(
-    base::debug::TracedValue* state) const {
+    base::trace_event::TracedValue* state) const {
   state->SetInteger("pending_tasks", pending_tasks_.size());
 
   state->BeginArray("tasks");
   for (std::set<TestOrderablePendingTask>::const_iterator it =
            pending_tasks_.begin();
        it != pending_tasks_.end();
        ++it) {
     state->BeginDictionary();
     it->AsValueInto(state);
     state->EndDictionary();
@@ skipping 46 matching lines @@
 
 bool OrderedSimpleTaskRunner::AdvanceNowCallback() {
   base::TimeTicks next_task_time = NextTaskTime();
   if (now_src_->Now() < next_task_time) {
     now_src_->SetNow(next_task_time);
   }
   return true;
 }
 
 }  // namespace cc