Index: cc/debug/frame_viewer_instrumentation.h |
diff --git a/cc/debug/frame_viewer_instrumentation.h b/cc/debug/frame_viewer_instrumentation.h |
index 16cf4335ac2bb20f6fcbbbd8183aa6b4fd29142a..c585bd8b4ff8b2353690219319ea5eb70985b1b2 100644 |
--- a/cc/debug/frame_viewer_instrumentation.h |
+++ b/cc/debug/frame_viewer_instrumentation.h |
@@ -28,7 +28,8 @@ scoped_ptr<base::Value> TileDataAsValue(const void* tile_id, |
int source_frame_number, |
int layer_id) { |
scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue); |
- res->Set(internal::kTileId, TracedValue::CreateIDRef(tile_id).release()); |
+ res->Set(internal::kTileId, |
+ base::debug::TracedValue::CreateIDRef(tile_id).release()); |
res->Set(internal::kTileResolution, |
TileResolutionAsValue(tile_resolution).release()); |
res->SetInteger(internal::kSourceFrameNumber, source_frame_number); |
@@ -48,10 +49,10 @@ class ScopedAnalyzeTask { |
internal::kCategory, |
internal::kAnalyzeTask, |
internal::kTileData, |
- TracedValue::FromValue(internal::TileDataAsValue(tile_id, |
- tile_resolution, |
- source_frame_number, |
- layer_id).release())); |
+ base::debug::TracedValue::FromValue( |
+ internal::TileDataAsValue( |
+ tile_id, tile_resolution, source_frame_number, layer_id) |
+ .release())); |
} |
~ScopedAnalyzeTask() { |
TRACE_EVENT_END0(internal::kCategory, internal::kAnalyzeTask); |
@@ -72,12 +73,13 @@ class ScopedRasterTask { |
internal::kCategory, |
internal::kRasterTask, |
internal::kTileData, |
- TracedValue::FromValue(internal::TileDataAsValue(tile_id, |
- tile_resolution, |
- source_frame_number, |
- layer_id).release()), |
+ base::debug::TracedValue::FromValue( |
+ internal::TileDataAsValue( |
+ tile_id, tile_resolution, source_frame_number, layer_id) |
+ .release()), |
internal::kRasterMode, |
- TracedValue::FromValue(RasterModeAsValue(raster_mode).release())); |
+ base::debug::TracedValue::FromValue( |
+ RasterModeAsValue(raster_mode).release())); |
} |
~ScopedRasterTask() { |
TRACE_EVENT_END0(internal::kCategory, internal::kRasterTask); |