Update from https://crrev.com/316786

cc/debug/devtools_instrumentation.h

Index: cc/debug/devtools_instrumentation.h
diff --git a/cc/debug/devtools_instrumentation.h b/cc/debug/devtools_instrumentation.h
index 73788a528af41faeaa85123c81eb51117d46032a..f1faf6ff424515ce75a238e771c5ca780529f8d1 100644
--- a/cc/debug/devtools_instrumentation.h
+++ b/cc/debug/devtools_instrumentation.h
@@ -96,9 +96,9 @@ struct ScopedCommitTrace {
 };
 
 struct ScopedLayerObjectTracker
-    : public base::debug::TraceScopedTrackableObject<int> {
+    : public base::trace_event::TraceScopedTrackableObject<int> {
   explicit ScopedLayerObjectTracker(int layer_id)
-      : base::debug::TraceScopedTrackableObject<int>(
+      : base::trace_event::TraceScopedTrackableObject<int>(
             internal::kCategory,
             internal::kLayerId,
             layer_id) {
@@ -142,10 +142,10 @@ inline void DidRequestMainThreadFrame(int layer_tree_host_id) {
                        layer_tree_host_id);
 }
 
-inline scoped_refptr<base::debug::ConvertableToTraceFormat>
+inline scoped_refptr<base::trace_event::ConvertableToTraceFormat>
 BeginMainThreadFrameData(int frame_id) {
-  scoped_refptr<base::debug::TracedValue> value =
-      new base::debug::TracedValue();
+  scoped_refptr<base::trace_event::TracedValue> value =
+      new base::trace_event::TracedValue();
   value->SetInteger("frameId", frame_id);
   return value;
 }