Update from https://crrev.com/316786

cc/debug/frame_viewer_instrumentation.cc

Index: cc/debug/frame_viewer_instrumentation.cc
diff --git a/cc/debug/frame_viewer_instrumentation.cc b/cc/debug/frame_viewer_instrumentation.cc
index bd0fbdc59ec69227d8542d23d1274625118e14f9..53c155166b8b3f5f21549d12e88e226945b606d8 100644
--- a/cc/debug/frame_viewer_instrumentation.cc
+++ b/cc/debug/frame_viewer_instrumentation.cc
@@ -18,12 +18,13 @@ const char kSourceFrameNumber[] = "sourceFrameNumber";
 const char kAnalyzeTask[] = "AnalyzeTask";
 const char kRasterTask[] = "RasterTask";
 
-scoped_refptr<base::debug::ConvertableToTraceFormat> TileDataAsValue(
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> TileDataAsValue(
     const void* tile_id,
     TileResolution tile_resolution,
     int source_frame_number,
     int layer_id) {
-  scoped_refptr<base::debug::TracedValue> res(new base::debug::TracedValue());
+  scoped_refptr<base::trace_event::TracedValue> res(
+      new base::trace_event::TracedValue());
   TracedValue::SetIDRef(tile_id, res.get(), kTileId);
   res->SetString(kTileResolution, TileResolutionToString(tile_resolution));
   res->SetInteger(kSourceFrameNumber, source_frame_number);