Update from https://crrev.com/316786

cc/resources/display_item_list.cc

Index: cc/resources/display_item_list.cc
diff --git a/cc/resources/display_item_list.cc b/cc/resources/display_item_list.cc
index 7a6929a1a5b7d1769612f85c4c50711ece337957..ac6ab57d18536cfb15d648f1dd259f1fcca257d6 100644
--- a/cc/resources/display_item_list.cc
+++ b/cc/resources/display_item_list.cc
@@ -65,10 +65,10 @@ size_t DisplayItemList::PictureMemoryUsage() const {
   return total_size;
 }
 
-scoped_refptr<base::debug::ConvertableToTraceFormat> DisplayItemList::AsValue()
-    const {
-  scoped_refptr<base::debug::TracedValue> state =
-      new base::debug::TracedValue();
+scoped_refptr<base::trace_event::ConvertableToTraceFormat>
+DisplayItemList::AsValue() const {
+  scoped_refptr<base::trace_event::TracedValue> state =
+      new base::trace_event::TracedValue();
 
   state->SetInteger("length", items_.size());
   state->BeginArray("params.items");