Update config entries for 'Win x64 Builder Perf' for LUCI migration

Bug: 828466
Cq-Include-Trybots: master.tryserver.chromium.perf:obbs_fyi
Change-Id: I7a0805b72598fcb978e2123f0c3c92c1d5ef1cad
Reviewed-on: https://chromium-review.googlesource.com/1238491
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593829}

infra/config/global/luci-milo.cfg

@@ -1243,8 +1243,7 @@ consoles {
     short_name: "32"
   }
   builders {
-    name: "buildbot/chromium.perf/Win x64 Builder Perf"
-    name: "buildbucket/luci.chrome.ci/Win x64 Builder Perf"
+    name: "buildbucket/luci.chrome.ci/win64-builder-perf"
     category: "builder|win"
     short_name: "64"
   }

testing/buildbot/chromium.perf.json

@@ -795,11 +795,6 @@
       "chromedriver"
     ]
   },
-  "Win x64 Builder Perf": {
-    "additional_compile_targets": [
-      "chromedriver"
-    ]
-  },
   "android-builder-perf": {
     "additional_compile_targets": [
       "microdump_stackwalk",
@@ -1850,5 +1845,10 @@
         }
       }
     ]
+  },
+  "win64-builder-perf": {
+    "additional_compile_targets": [
+      "chromedriver"
+    ]
   }
 }

tools/mb/mb_config.pyl

@@ -387,8 +387,6 @@
       # TODO(crbug.com/828472): Remove 'Win Builder Perf'
       'Win Builder Perf': 'official_goma_x86',
       'win32-builder-perf': 'official_goma_x86',
-      # TODO(crbug.com/828466): Remove 'Win x64 Builder Perf'
-      'Win x64 Builder Perf': 'official_goma',
       'win64-builder-perf': 'official_goma',
     },
 

tools/perf/core/perf_data_generator.py

@@ -47,7 +47,7 @@ BUILDER_ADDITIONAL_COMPILE_TARGETS = {
     'Linux Builder Perf': ['chromedriver'],
     'Mac Builder Perf': ['chromedriver'],
     'Win Builder Perf': ['chromedriver'],
-    'Win x64 Builder Perf': ['chromedriver'],
+    'win64-builder-perf': ['chromedriver'],
 }