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

scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_Win.json b/scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
similarity index 96%
copy from scripts/slave/recipes/chromium.expected/full_chromium_Win.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
index 80a801043a6921fd6e2facee1c695094a5168577..0b23cc2caeb8a851cb16f493ff3fee7e1254b3cc 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_Win.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
@@ -16,7 +16,7 @@
       "--master",
       "chromium",
       "--builder",
-      "Win",
+      "Win x64",
       "--slave",
       "TestSlavename",
       "--spec",
@@ -117,7 +117,7 @@
       "-u",
       "RECIPE_MODULE[build::cipd]\\resources\\bootstrap.py",
       "--platform",
-      "windows-386",
+      "windows-amd64",
       "--dest-directory",
       "[SLAVE_BUILD]\\cipd",
       "--json-output",
@@ -172,7 +172,7 @@
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' linux_dump_symbols=0 target_arch=ia32 test_isolation_mode=noop use_goma=1",
+      "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' linux_dump_symbols=0 target_arch=x64 test_isolation_mode=noop use_goma=1",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
@@ -186,11 +186,11 @@
       "/path/to/tmp/json",
       "--",
       "--build-config-fs",
-      "Release",
+      "Release_x64",
       "--paths",
       "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
       "--properties",
-      "{\"buildername\": \"Win\", \"buildnumber\": 571, \"mastername\": \"chromium\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
+      "{\"buildername\": \"Win x64\", \"buildnumber\": 571, \"mastername\": \"chromium\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "get compile targets for scripts",
@@ -240,7 +240,7 @@
       "--ninja-path",
       "RECIPE_PACKAGE_REPO[depot_tools]\\ninja.exe",
       "--target",
-      "Release",
+      "Release_x64",
       "--src-dir",
       "[SLAVE_BUILD]\\src",
       "--goma-cache-dir",
@@ -277,7 +277,7 @@
       "--target",
       "Release",
       "--factory-properties",
-      "{\"gclient_env\": {\"GYP_DEFINES\": \"chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\\\cipd\\\\goma' linux_dump_symbols=0 target_arch=ia32 test_isolation_mode=noop use_goma=1\"}, \"gs_acl\": \"public-read\", \"gs_bucket\": \"gs://chromium-browser-snapshots\"}",
+      "{\"gclient_env\": {\"GYP_DEFINES\": \"chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\\\cipd\\\\goma' linux_dump_symbols=0 target_arch=x64 test_isolation_mode=noop use_goma=1\"}, \"gs_acl\": \"public-read\", \"gs_bucket\": \"gs://chromium-browser-snapshots\"}",
       "--build-properties",
       "{\"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#170242}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"}",
       "--mode",