telemetry: Refactored rasterize_and_record measurement.

cc/layers/picture_layer.cc

Index: cc/layers/picture_layer.cc
diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
index 1c1266445ea3070df9321998eba30f38561d8eb8..89157a3fc9e052d6dbc267f38632064c5394506c 100644
--- a/cc/layers/picture_layer.cc
+++ b/cc/layers/picture_layer.cc
@@ -4,7 +4,6 @@
 
 #include "cc/layers/picture_layer.h"
 
-#include "cc/debug/benchmark_instrumentation.h"
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
@@ -75,9 +74,8 @@ bool PictureLayer::Update(ResourceUpdateQueue* queue,
   // Do not early-out of this function so that PicturePile::Update has a chance
   // to record pictures due to changing visibility of this layer.
 
-  TRACE_EVENT1(benchmark_instrumentation::kCategory,
-               benchmark_instrumentation::kPictureLayerUpdate,
-               benchmark_instrumentation::kSourceFrameNumber,
+  TRACE_EVENT1("cc", "PictureLayer::Update",
+               "source_frame_number",
                layer_tree_host()->source_frame_number());
 
   bool updated = Layer::Update(queue, occlusion);