Telemetry: Use cc frames and fix bots.

tools/perf/metrics/timeline_unittest.py

Index: tools/perf/metrics/timeline_unittest.py
diff --git a/tools/perf/metrics/timeline_unittest.py b/tools/perf/metrics/timeline_unittest.py
index c3279568ff1698a24620677e616749f58df30adb..1bc1b09ddf0aae0824210c73c5903716a5921053 100644
--- a/tools/perf/metrics/timeline_unittest.py
+++ b/tools/perf/metrics/timeline_unittest.py
@@ -77,12 +77,12 @@ class ThreadTimesTimelineMetricUnittest(unittest.TestCase):
     renderer_main.name = 'CrRendererMain'
 
     # Create two frame swaps (Results times should be divided by two)
-    gpu_main = model.GetOrCreateProcess(1).GetOrCreateThread(3)
-    gpu_main.name = 'CrGpuMain'
-    gpu_main.BeginSlice('gpucat', ':RealSwapBuffers', 10, 10)
-    gpu_main.EndSlice(11, 11)
-    gpu_main.BeginSlice('gpucat', ':RealSwapBuffers', 12, 12)
-    gpu_main.EndSlice(13, 13)
+    cc_main = model.GetOrCreateProcess(1).GetOrCreateThread(3)
+    cc_main.name = 'Compositor'
+    cc_main.BeginSlice('cc_cat', timeline.CompositorFrameTraceName, 10, 10)
+    cc_main.EndSlice(11, 11)
+    cc_main.BeginSlice('cc_cat', timeline.CompositorFrameTraceName, 12, 12)
+    cc_main.EndSlice(13, 13)
 
     # [      X       ]
     #      [  Y  ]