Update from https://crrev.com/316786

cc/test/test_now_source.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 <limits>
 #include <string>
 
 #include "cc/test/test_now_source.h"
 
 namespace cc {
@@ skipping 75 matching lines @@
 
 // TestNowSource::Convenience functions
 void TestNowSource::AdvanceNowMicroseconds(int64_t period_in_microseconds) {
   AdvanceNow(base::TimeDelta::FromMicroseconds(period_in_microseconds));
 }
 void TestNowSource::SetNowMicroseconds(int64_t time_in_microseconds) {
   SetNow(base::TimeTicks::FromInternalValue(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;
 }
 
 // TestNowSource::Pretty printing functions
 std::string TestNowSource::ToString() const {
   std::string output("TestNowSource(");
   AsValue()->AppendAsTraceFormat(&output);
   output += ")";
   return output;
 }
 
 ::std::ostream& operator<<(::std::ostream& os,
                            const scoped_refptr<TestNowSource>& src) {
   os << src->ToString();
   return os;
 }
 void PrintTo(const scoped_refptr<TestNowSource>& src, ::std::ostream* os) {
   *os << src;
 }
 
 }  // namespace cc