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

scripts/slave/recipe_modules/chromium_tests/chromium_webrtc_fyi.py

Index: scripts/slave/recipe_modules/chromium_tests/chromium_webrtc_fyi.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_webrtc_fyi.py b/scripts/slave/recipe_modules/chromium_tests/chromium_webrtc_fyi.py
index 7693163d3c7499353e5a19a8e408561dabdaeff5..e6396f930fbc6b11b1b88aed0debd3f1831a52a7 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_webrtc_fyi.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_webrtc_fyi.py
@@ -21,16 +21,16 @@ SPEC = {
 }
 
 
-def AddGNBuilder(spec, name):
-  SPEC['builders'][name] = copy.deepcopy(spec['builders'][name])
+def AddGNBuilder(spec, name, dest_name=None):

[kjellander_chromium, 2016/04/22 06:26:21]

Thanks updating my bots :)

+  SPEC['builders'][dest_name or name] = copy.deepcopy(spec['builders'][name])
 
 
 AddGNBuilder(chromium_linux.SPEC, 'Android GN')
 AddGNBuilder(chromium_linux.SPEC, 'Android GN (dbg)')
 AddGNBuilder(chromium_mac.SPEC, 'Mac GN')
 AddGNBuilder(chromium_mac.SPEC, 'Mac GN (dbg)')
-AddGNBuilder(chromium_win.SPEC, 'Win x64 GN')
-AddGNBuilder(chromium_win.SPEC, 'Win x64 GN (dbg)')
+AddGNBuilder(chromium_win.SPEC, 'Win x64 Builder', 'Win x64 GN')
+AddGNBuilder(chromium_win.SPEC, 'Win x64 Builder (dbg)', 'Win x64 GN (dbg)')
 
 
 for b in SPEC['builders'].itervalues():