Update swarming dimension of 'Android Nexus5 Perf' builder to match migrated swarming bots

NOTRY=true  # tests are covered by PRESUBMIT

Bug: 840008
Change-Id: I7292978d28cdf0c662d78d6dfb2dadbc103ec178
Reviewed-on: https://chromium-review.googlesource.com/1052215Reviewed-by: Emily Hanley <eyaich@chromium.org>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#557192}

tools/perf/core/benchmark_sharding_map.json

@@ -5,12 +5,12 @@
     "tools/perf/core/benchmark_*_bot_map.json"
   ],
   "Android Nexus5 Perf": {
-    "build13-b1--device1": {
+    "build199-b7--device1": {
       "benchmarks": [
         "system_health.memory_mobile"
       ]
     },
-    "build13-b1--device2": {
+    "build199-b7--device2": {
       "benchmarks": [
         "loading.desktop",
         "smoothness.key_silk_cases",
@@ -18,7 +18,7 @@
         "system_health.memory_desktop"
       ]
     },
-    "build13-b1--device3": {
+    "build199-b7--device3": {
       "benchmarks": [
         "blink_perf.image_decoder",
         "blink_perf.owp_storage",
@@ -26,7 +26,7 @@
 	"rendering.desktop"
       ]
     },
-    "build13-b1--device4": {
+    "build199-b7--device4": {
       "benchmarks": [
         "speedometer-future",
         "speedometer2-future",
@@ -34,13 +34,13 @@
         "v8.browsing_mobile-future"
       ]
     },
-    "build13-b1--device5": {
+    "build199-b7--device5": {
       "benchmarks": [
         "system_health.common_desktop",
         "v8.browsing_mobile"
       ]
     },
-    "build13-b1--device6": {
+    "build199-b7--device6": {
       "benchmarks": [
         "memory.desktop",
         "power.typical_10_mobile",
@@ -49,14 +49,14 @@
         "webrtc"
       ]
     },
-    "build13-b1--device7": {
+    "build199-b7--device7": {
       "benchmarks": [
         "blink_perf.shadow_dom",
         "power.idle_platform",
         "smoothness.gpu_rasterization_and_decoding.image_decoding_cases"
       ]
     },
-    "build14-b1--device1": {
+    "build200-b7--device1": {
       "benchmarks": [
         "battor.trivial_pages",
         "media.desktop",
@@ -67,7 +67,7 @@
         "thread_times.key_idle_power_cases"
       ]
     },
-    "build14-b1--device2": {
+    "build200-b7--device2": {
       "benchmarks": [
         "dummy_benchmark.histogram_benchmark_1",
         "dummy_benchmark.noisy_benchmark_1",
@@ -77,7 +77,7 @@
         "speedometer2"
       ]
     },
-    "build14-b1--device3": {
+    "build200-b7--device3": {
       "benchmarks": [
         "memory.top_10_mobile",
         "smoothness.gpu_rasterization.tough_filters_cases",
@@ -86,7 +86,7 @@
         "smoothness.tough_pinch_zoom_cases"
       ]
     },
-    "build14-b1--device4": {
+    "build200-b7--device4": {
       "benchmarks": [
         "blink_perf.bindings",
         "blink_perf.canvas",
@@ -96,7 +96,7 @@
         "system_health.webview_startup"
       ]
     },
-    "build14-b1--device5": {
+    "build200-b7--device5": {
       "benchmarks": [
         "blink_perf.layout",
         "dromaeo",
@@ -106,7 +106,7 @@
         "thread_times.simple_mobile_sites"
       ]
     },
-    "build14-b1--device6": {
+    "build200-b7--device6": {
       "benchmarks": [
         "battor.steady_state",
         "blink_perf.svg",
@@ -116,13 +116,13 @@
         "thread_times.key_noop_cases"
       ]
     },
-    "build14-b1--device7": {
+    "build200-b7--device7": {
       "benchmarks": [
         "memory.long_running_idle_gmail_tbmv2",
         "system_health.common_mobile"
       ]
     },
-    "build48-b1--device1": {
+    "build201-b7--device1": {
       "benchmarks": [
         "loading.mobile",
         "media.mobile",
@@ -131,7 +131,7 @@
         "v8.browsing_desktop"
       ]
     },
-    "build48-b1--device2": {
+    "build201-b7--device2": {
       "benchmarks": [
         "blink_perf.events",
         "dummy_benchmark.stable_benchmark_1",
@@ -139,7 +139,7 @@
         "smoothness.tough_ad_cases"
       ]
     },
-    "build48-b1--device3": {
+    "build201-b7--device3": {
       "benchmarks": [
         "smoothness.key_desktop_move_cases",
         "smoothness.sync_scroll.key_mobile_sites_smooth",
@@ -147,7 +147,7 @@
         "thread_times.tough_scrolling_cases"
       ]
     },
-    "build48-b1--device4": {
+    "build201-b7--device4": {
       "benchmarks": [
         "blink_perf.dom",
         "rasterize_and_record_micro.top_25",
@@ -155,7 +155,7 @@
         "thread_times.key_silk_cases"
       ]
     },
-    "build48-b1--device5": {
+    "build201-b7--device5": {
       "benchmarks": [
         "blink_perf.css",
         "blink_perf.parser",
@@ -165,7 +165,7 @@
         "start_with_url.warm.startup_pages"
       ]
     },
-    "build48-b1--device6": {
+    "build201-b7--device6": {
       "benchmarks": [
         "blink_perf.paint",
         "kraken",
@@ -174,7 +174,7 @@
         "tracing.tracing_with_background_memory_infra"
       ]
     },
-    "build48-b1--device7": {
+    "build201-b7--device7": {
       "benchmarks": [
         "smoothness.desktop_tough_pinch_zoom_cases",
         "smoothness.tough_path_rendering_cases",

tools/perf/core/perf_data_generator.py

@@ -166,25 +166,28 @@ def get_waterfall_config():
     swarming=[
       {
        'os': 'Android',
-       'pool': 'Chrome-perf',
+       'pool': 'chrome.tests.perf',
        'device_ids': [
-           'build13-b1--device1', 'build13-b1--device2', 'build13-b1--device3',
-           'build13-b1--device4', 'build13-b1--device5', 'build13-b1--device6',
-           'build13-b1--device7',
-           'build14-b1--device1', 'build14-b1--device2', 'build14-b1--device3',
-           'build14-b1--device4', 'build14-b1--device5', 'build14-b1--device6',
-           'build14-b1--device7',
-           'build48-b1--device1', 'build48-b1--device2', 'build48-b1--device3',
-           'build48-b1--device4', 'build48-b1--device5', 'build48-b1--device6',
-           'build48-b1--device7',
+           'build199-b7--device1', 'build199-b7--device2',
+           'build199-b7--device3', 'build199-b7--device4',
+           'build199-b7--device5', 'build199-b7--device6',
+           'build199-b7--device7',
+           'build200-b7--device1', 'build200-b7--device2',
+           'build200-b7--device3', 'build200-b7--device4',
+           'build200-b7--device5', 'build200-b7--device6',
+           'build200-b7--device7',
+           'build201-b7--device1', 'build201-b7--device2',
+           'build201-b7--device3', 'build201-b7--device4',
+           'build201-b7--device5', 'build201-b7--device6',
+           'build201-b7--device7',
           ],
        'perf_tests': [
-         ('tracing_perftests', 'build13-b1--device2'),
-         ('gpu_perftests', 'build13-b1--device2'),
-         ('components_perftests', 'build48-b1--device5'),
+         ('tracing_perftests', 'build199-b7--device2'),
+         ('gpu_perftests', 'build199-b7--device2'),
+         ('components_perftests', 'build201-b7--device5'),
         ],
        'perf_tests_with_args': [
-         ('angle_perftests', 'build13-b1--device3', ['--shard-timeout=300'],
+         ('angle_perftests', 'build199-b7--device3', ['--shard-timeout=300'],
            'angle_perftests'),
        ]
       }