Revert "Switch Windows 10 GPU testing to 64-bit."

This reverts commit e3121f99.

Reason for revert: Looks like it broke Win10 (Debug|Release) (NVIDIA)
See https://ci.chromium.org/p/chromium/builders/ci/Win10%20Debug%20%28NVIDIA%29/23156 for example failure.

Original change's description:
> Switch Windows 10 GPU testing to 64-bit.
> 
> See
> https://chromium-review.googlesource.com/c/chromium/tools/build/+/1750303
> 
> Bug: 988833
> Change-Id: If6082a035eec474d3299afb89bd78ca225d95ed6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1747005
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
> Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#686321}

TBR=ynovikov@chromium.org,kbr@chromium.org,tikuta@chromium.org

Change-Id: If0922864c7beaa2209933d47c1bf7385c3b39a42
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 988833
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1750470Reviewed-by: Fergus Dall <sidereal@google.com>
Commit-Queue: Fergus Dall <sidereal@google.com>
Cr-Commit-Position: refs/heads/master@{#686333}

testing/buildbot/chromium.gpu.json

@@ -3291,7 +3291,7 @@
         "args": [
           "context_lost",
           "--show-stdout",
-          "--browser=debug_x64",
+          "--browser=debug",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -3320,7 +3320,7 @@
         "args": [
           "depth_capture",
           "--show-stdout",
-          "--browser=debug_x64",
+          "--browser=debug",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -3349,7 +3349,7 @@
         "args": [
           "gpu_process",
           "--show-stdout",
-          "--browser=debug_x64",
+          "--browser=debug",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -3378,7 +3378,7 @@
         "args": [
           "hardware_accelerated_feature",
           "--show-stdout",
-          "--browser=debug_x64",
+          "--browser=debug",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -3407,7 +3407,7 @@
         "args": [
           "info_collection",
           "--show-stdout",
-          "--browser=debug_x64",
+          "--browser=debug",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
@@ -3440,7 +3440,7 @@
         "args": [
           "maps",
           "--show-stdout",
-          "--browser=debug_x64",
+          "--browser=debug",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
@@ -3476,7 +3476,7 @@
         "args": [
           "pixel",
           "--show-stdout",
-          "--browser=debug_x64",
+          "--browser=debug",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
@@ -3521,7 +3521,7 @@
         "args": [
           "screenshot_sync",
           "--show-stdout",
-          "--browser=debug_x64",
+          "--browser=debug",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
@@ -3551,7 +3551,7 @@
         "args": [
           "trace_test",
           "--show-stdout",
-          "--browser=debug_x64",
+          "--browser=debug",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -3580,7 +3580,7 @@
         "args": [
           "webgl_conformance",
           "--show-stdout",
-          "--browser=debug_x64",
+          "--browser=debug",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -3839,7 +3839,7 @@
         "args": [
           "context_lost",
           "--show-stdout",
-          "--browser=release_x64",
+          "--browser=release",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -3877,7 +3877,7 @@
         "args": [
           "depth_capture",
           "--show-stdout",
-          "--browser=release_x64",
+          "--browser=release",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -3915,7 +3915,7 @@
         "args": [
           "gpu_process",
           "--show-stdout",
-          "--browser=release_x64",
+          "--browser=release",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -3953,7 +3953,7 @@
         "args": [
           "hardware_accelerated_feature",
           "--show-stdout",
-          "--browser=release_x64",
+          "--browser=release",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -3991,7 +3991,7 @@
         "args": [
           "info_collection",
           "--show-stdout",
-          "--browser=release_x64",
+          "--browser=release",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
@@ -4033,7 +4033,7 @@
         "args": [
           "maps",
           "--show-stdout",
-          "--browser=release_x64",
+          "--browser=release",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
@@ -4078,7 +4078,7 @@
         "args": [
           "pixel",
           "--show-stdout",
-          "--browser=release_x64",
+          "--browser=release",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
@@ -4132,7 +4132,7 @@
         "args": [
           "screenshot_sync",
           "--show-stdout",
-          "--browser=release_x64",
+          "--browser=release",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
@@ -4171,7 +4171,7 @@
         "args": [
           "trace_test",
           "--show-stdout",
-          "--browser=release_x64",
+          "--browser=release",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
@@ -4209,7 +4209,7 @@
         "args": [
           "webgl_conformance",
           "--show-stdout",
-          "--browser=release_x64",
+          "--browser=release",
           "--passthrough",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"

testing/buildbot/waterfalls.pyl

@@ -2209,7 +2209,7 @@
         },
       },
       'Win10 Debug (NVIDIA)': {
-        'browser_config': 'debug_x64',
+        'browser_config': 'debug',
         'os_type': 'win',
         'mixins': [
           'win10_nvidia_quadro_p400_stable',
@@ -2220,7 +2220,7 @@
         },
       },
       'Win10 Release (NVIDIA)': {
-        'browser_config': 'release_x64',
+        'browser_config': 'release',
         'os_type': 'win',
         'mixins': [
           'win10_nvidia_quadro_p400_stable',

tools/mb/mb_config.pyl

@@ -365,8 +365,8 @@
       'GPU Mac Builder (dbg)': 'gpu_tests_debug_trybot',
       'GPU Linux Builder': 'gpu_tests_release_trybot',
       'GPU Linux Builder (dbg)': 'gpu_tests_debug_trybot',
-      'GPU Win Builder': 'gpu_tests_release_trybot_resource_whitelisting',
-      'GPU Win Builder (dbg)': 'gpu_tests_debug_trybot',
+      'GPU Win Builder': 'gpu_tests_release_trybot_x86_resource_whitelisting',
+      'GPU Win Builder (dbg)': 'gpu_tests_debug_trybot_x86',
       'Android Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64',
     },
 
@@ -860,8 +860,8 @@
       'gpu-fyi-try-win10-nvidia-dqp-64': 'deqp_release_trybot',
       'gpu-fyi-try-win10-nvidia-exp-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-nvidia-rel-64': 'gpu_fyi_tests_release_trybot',
-      'gpu-try-win10-nvidia-dbg': 'gpu_tests_debug_trybot',
-      'gpu-try-win10-nvidia-rel': 'gpu_tests_release_trybot_resource_whitelisting',
+      'gpu-try-win10-nvidia-dbg': 'gpu_tests_debug_trybot_x86',
+      'gpu-try-win10-nvidia-rel': 'gpu_tests_release_trybot_x86_resource_whitelisting',
       'win10_chromium_x64_dbg_ng': 'gpu_tests_debug_trybot',
       'win10_chromium_x64_rel_ng': 'gpu_tests_release_trybot_resource_whitelisting',
       'win10_chromium_x64_rel_ng_exp': 'release_trybot',