[NOT FOR REVIEW]

tools/perf/measurements/draw_properties.py

Index: tools/perf/measurements/draw_properties.py
diff --git a/tools/perf/measurements/draw_properties.py b/tools/perf/measurements/draw_properties.py
index 3021930188375570f71fa391bba76cfcd91b9394..157d0ed2821b7c4e296e16b2312c2c5457a87ffc 100644
--- a/tools/perf/measurements/draw_properties.py
+++ b/tools/perf/measurements/draw_properties.py
@@ -21,8 +21,8 @@ class DrawProperties(legacy_page_test.LegacyPageTest):
   def WillNavigateToPage(self, page, tab):
     del page  # unused
     config = tracing_config.TracingConfig()
-    config.chrome_trace_config.category_filter.AddDisabledByDefault(
-        'disabled-by-default-cc.debug.cdp-perf')
+    config.chrome_trace_config.category_filter.AddIncludedCategory(
+        'cc')
     config.enable_chrome_trace = True
     tab.browser.platform.tracing_controller.StartTracing(config)
 
@@ -41,13 +41,20 @@ class DrawProperties(legacy_page_test.LegacyPageTest):
     timeline_data = tab.browser.platform.tracing_controller.StopTracing()
     timeline_model = model.TimelineModel(timeline_data)
 
-    pt_avg = self.ComputeAverageOfDurations(
+    bpt_avg = self.ComputeAverageOfDurations(
         timeline_model,
-        'LayerTreeHostCommon::ComputeVisibleRectsWithPropertyTrees')
+        'LayerTreeHostInProcess::UpdateLayers::BuildPropertyTrees')
+    cdp_avg = self.ComputeAverageOfDurations(
+        timeline_model,
+        'LayerTreeImpl::UpdateDrawProperties::CalculateDrawProperties')
+
+    results.AddValue(scalar.ScalarValue(
+        results.current_page, 'PT_build_cost', 'ms', bpt_avg,
+        description='Average time spent building property trees'))
 
     results.AddValue(scalar.ScalarValue(
-        results.current_page, 'PT_avg_cost', 'ms', pt_avg,
-        description='Average time spent processing property trees'))
+        results.current_page, 'Impl_cdp_cost', 'ms', cdp_avg,
+        description='Average time spent calculating draw properties'))
 
   def DidRunPage(self, platform):
     tracing_controller = platform.tracing_controller