Rename Mac/Win GN builders to GYP builders.

masters/master.tryserver.chromium.win/slaves.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 def distribute_slaves(slave_numbers, builders, os_ver, pool=None, gce=False):
   hostname_format = 'vm%d-m4' if not gce else 'slave%d-c4'
   return [
     {
@@ skipping 80 matching lines @@
       optional_builders_chromium,
       'win7',
       'win_optional_chromium')
 
   optional_pool = optional_pool_chromium + optional_pool_gn
 
   win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) +
       range(408, 422) + range(468, 495) +
       range(724, 738) + range(801, 804))
   win8_builders = [
-      'win8_chromium_ng',
-      'win8_chromium_gn_dbg',
+      'win8_chromium_gyp_rel',
+      'win8_chromium_gyp_dbg',
       'win8_chromium_gn_upload',
       'win10_chromium_x64_rel_ng',
   ]
   win8_pool = distribute_slaves(win8_slaves, win8_builders, 'win8', 'win8')
 
   win_pgo_pool = [
     {
       'master': 'TryServerChromiumWin',
       'builder': ['win_pgo'],
       'hostname': 'build44-m4',
@@ skipping 34 matching lines @@
   return (
       cq_pool +
       optional_pool +
       win8_pool +
       win_pgo_pool +
       clang_win_pool +
       experimental_pool)
 
 
 slaves = windows()