Update from https://crrev.com/316786

cc/resources/clip_display_item.h

Index: cc/resources/clip_display_item.h
diff --git a/cc/resources/clip_display_item.h b/cc/resources/clip_display_item.h
index 70725f35dda09a36cc1575a4b3c7ef870398b776..e5e72bffbfb9ca76ba144b6f3fed5b22f5e99b9c 100644
--- a/cc/resources/clip_display_item.h
+++ b/cc/resources/clip_display_item.h
@@ -33,7 +33,7 @@ class CC_EXPORT ClipDisplayItem : public DisplayItem {
   bool IsSuitableForGpuRasterization() const override;
   int ApproximateOpCount() const override;
   size_t PictureMemoryUsage() const override;
-  void AsValueInto(base::debug::TracedValue* array) const override;
+  void AsValueInto(base::trace_event::TracedValue* array) const override;
 
  protected:
   ClipDisplayItem(gfx::Rect clip_rect,
@@ -57,7 +57,7 @@ class CC_EXPORT EndClipDisplayItem : public DisplayItem {
   bool IsSuitableForGpuRasterization() const override;
   int ApproximateOpCount() const override;
   size_t PictureMemoryUsage() const override;
-  void AsValueInto(base::debug::TracedValue* array) const override;
+  void AsValueInto(base::trace_event::TracedValue* array) const override;
 
  protected:
   EndClipDisplayItem();