Update from https://crrev.com/316786

cc/resources/picture.h

 // Copyright 2012 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.
 
 #ifndef CC_RESOURCES_PICTURE_H_
 #define CC_RESOURCES_PICTURE_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 131 matching lines @@
   void GatherPixelRefs(const gfx::Size& tile_grid_info);
 
   gfx::Rect layer_rect_;
   skia::RefPtr<SkPicture> picture_;
 
   PixelRefMap pixel_refs_;
   gfx::Point min_pixel_cell_;
   gfx::Point max_pixel_cell_;
   gfx::Size cell_size_;
 
-  scoped_refptr<base::debug::ConvertableToTraceFormat>
+  scoped_refptr<base::trace_event::ConvertableToTraceFormat>
     AsTraceableRasterData(float scale) const;
-  scoped_refptr<base::debug::ConvertableToTraceFormat>
+  scoped_refptr<base::trace_event::ConvertableToTraceFormat>
     AsTraceableRecordData() const;
 
   friend class base::RefCountedThreadSafe<Picture>;
   friend class PixelRefIterator;
   DISALLOW_COPY_AND_ASSIGN(Picture);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_H_