Enabling rendering.desktop and rendering.mobile on perf waterfall

Bug:827663
Change-Id: I297b5307d40630bcbede26206cd449649d75876a

NOTRY=true  # Flake

Change-Id: I297b5307d40630bcbede26206cd449649d75876a
Reviewed-on: https://chromium-review.googlesource.com/992635
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#547926}

tools/perf/benchmark.csv

@@ -44,6 +44,8 @@ power.idle_platform,"charliea@chromium.org, rnephew@chromium.org",
 power.typical_10_mobile,perezju@chromium.org,
 rasterize_and_record_micro.partial_invalidation,"vmpstr@chromium.org, wkorman@chromium.org",Internals>Compositing>Rasterization
 rasterize_and_record_micro.top_25,"vmpstr@chromium.org, wkorman@chromium.org",Internals>Compositing>Rasterization
+rendering.desktop,"sadrul@chromium.org, vmiura@chromium.org",
+rendering.mobile,"sadrul@chromium.org, vmiura@chromium.org",
 resource_sizes,"agrieve@chromium.org, rnephew@chromium.org, perezju@chromium.org",
 scheduler.tough_scheduling_cases,"skyostil@chromium.org, brianderson@chromium.org",
 sizes (linux),thestig@chromium.org,

tools/perf/core/benchmark_android_bot_map.json

@@ -55,12 +55,14 @@
   },
   "16": {
     "benchmarks": [
-      "smoothness.top_25_smooth"
+      "smoothness.top_25_smooth",
+      "rendering.mobile"
     ]
   },
   "17": {
     "benchmarks": [
-      "smoothness.tough_ad_cases"
+      "smoothness.tough_ad_cases",
+      "rendering.desktop"
     ]
   },
   "18": {

tools/perf/core/benchmark_desktop_bot_map.json

@@ -64,11 +64,13 @@
   "16": {
     "benchmarks": [
       "smoothness.gpu_rasterization.tough_filters_cases",
-      "speedometer-future"
+      "speedometer-future",
+       "rendering.mobile"
     ]
   },
   "17": {
     "benchmarks": [
+      "rendering.desktop",
       "smoothness.gpu_rasterization.tough_path_rendering_cases",
       "speedometer2"
     ]

tools/perf/core/perf_data_generator.py

@@ -35,9 +35,7 @@ from core.sharding_map_generator import load_benchmark_sharding_map
 
 
 _UNSCHEDULED_TELEMETRY_BENCHMARKS = set([
-  'experimental.startup.android.coldish',
-  'rendering.desktop',
-  'rendering.mobile'
+  'experimental.startup.android.coldish'
   ])