Update from https://crrev.com/316786

cc/test/test_now_source.cc

Index: cc/test/test_now_source.cc
diff --git a/cc/test/test_now_source.cc b/cc/test/test_now_source.cc
index 2ffb36ec04e469934df03cc929531865809fa4cb..0576d06b4fdf8a1765fabc810040024ca2c61455 100644
--- a/cc/test/test_now_source.cc
+++ b/cc/test/test_now_source.cc
@@ -93,14 +93,14 @@ void TestNowSource::SetNowMicroseconds(int64_t time_in_microseconds) {
 }
 
 // TestNowSource::Tracing functions
-void TestNowSource::AsValueInto(base::debug::TracedValue* state) const {
+void TestNowSource::AsValueInto(base::trace_event::TracedValue* state) const {
   state->SetInteger("now_in_microseconds", now_.ToInternalValue());
 }
 
-scoped_refptr<base::debug::ConvertableToTraceFormat> TestNowSource::AsValue()
-    const {
-  scoped_refptr<base::debug::TracedValue> state =
-      new base::debug::TracedValue();
+scoped_refptr<base::trace_event::ConvertableToTraceFormat>
+TestNowSource::AsValue() const {
+  scoped_refptr<base::trace_event::TracedValue> state =
+      new base::trace_event::TracedValue();
   AsValueInto(state.get());
   return state;
 }