Move Win x64 clobber bot and remove Win x64 GN bots.

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

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright (c) 2012 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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 import os
@@ skipping 68 matching lines @@
   # Share build directory with compatible existing builders to save space.
   'slavebuilddir': 'win',
 })
 
 chromium_builders.append({
   'name': 'win_archive',
   'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
 })
 
 chromium_builders.append({
+  'name': 'win_x64_archive',
+  'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+})
+
+chromium_builders.append({
   'name': 'win_chromium_x64_rel_ng',
   'factory': m_annotator.BaseFactory(
       'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
   # Share build directory with compatible existing builders to save space.
   'slavebuilddir': 'win'
 })
 
 chromium_builders.extend([{
     'name': 'win8_chromium_ng',
     'factory': m_annotator.BaseFactory('chromium_trybot'),
     'slavebuilddir': 'win_gn',
   },{
-    'name': 'win_chromium_gn_x64_dbg',
-    'factory': m_annotator.BaseFactory('chromium_trybot'),
-    'slavebuilddir': 'win_gn',
-  },{
-    'name': 'win_chromium_gn_x64_rel',
-    'factory': m_annotator.BaseFactory('chromium_trybot'),
-    'slavebuilddir': 'win_gn',
-  },{
     'name': 'win8_chromium_gn_dbg',
     'factory': m_annotator.BaseFactory('chromium_trybot'),
     'slavebuilddir': 'win_gn',
   },{
     'name': 'win8_chromium_gn_upload',
     'factory': m_annotator.BaseFactory('chromium_gn_upload'),
     'slavebuilddir': 'win_gn',
   },
 ])
 
@@ skipping 248 matching lines @@
 #  base.make_stop_form = hack_stop(base.make_stop_form)
 
 
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # vi: set ts=4 sts=2 sw=2 et: