Update from https://crrev.com/316786

base/test/test_pending_task.cc

Index: base/test/test_pending_task.cc
diff --git a/base/test/test_pending_task.cc b/base/test/test_pending_task.cc
index 94989de4bb9ec90512b02f1b2fc3e2e08b94c384..3f2c79dfc9bfd773cc7319f3ac8f4a2ea39fd5cc 100644
--- a/base/test/test_pending_task.cc
+++ b/base/test/test_pending_task.cc
@@ -34,7 +34,7 @@ bool TestPendingTask::ShouldRunBefore(const TestPendingTask& other) const {
 
 TestPendingTask::~TestPendingTask() {}
 
-void TestPendingTask::AsValueInto(base::debug::TracedValue* state) const {
+void TestPendingTask::AsValueInto(base::trace_event::TracedValue* state) const {
   state->SetInteger("run_at", GetTimeToRun().ToInternalValue());
   state->SetString("posting_function", location.ToString());
   state->SetInteger("post_time", post_time.ToInternalValue());
@@ -50,10 +50,10 @@ void TestPendingTask::AsValueInto(base::debug::TracedValue* state) const {
   state->SetInteger("delay", delay.ToInternalValue());
 }
 
-scoped_refptr<base::debug::ConvertableToTraceFormat> TestPendingTask::AsValue()
-    const {
-  scoped_refptr<base::debug::TracedValue> state =
-      new base::debug::TracedValue();
+scoped_refptr<base::trace_event::ConvertableToTraceFormat>
+TestPendingTask::AsValue() const {
+  scoped_refptr<base::trace_event::TracedValue> state =
+      new base::trace_event::TracedValue();
   AsValueInto(state.get());
   return state;
 }