goma: back to build-provided client and disable oauth2

scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_win_angle_x64_dbg_ng.json

Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_win_angle_x64_dbg_ng.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_win_angle_x64_dbg_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_win_angle_x64_dbg_ng.json
index 2fb01c36ed4f3c66c0bd5a8cf6b3b3a4aa44091d..4d5f0e1f297df52510f7102fd7c90d3d38b911fb 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_win_angle_x64_dbg_ng.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_win_angle_x64_dbg_ng.json
@@ -115,63 +115,6 @@
     ]
   },
   {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ensure_goma"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[build::cipd]\\resources\\bootstrap.py",
-      "--platform",
-      "windows-amd64",
-      "--dest-directory",
-      "[SLAVE_BUILD]\\cipd",
-      "--json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ensure_goma.install cipd",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[SLAVE_BUILD]\\cipd\\cipd",
-      "ensure",
-      "--root",
-      "[CACHE]\\cipd\\goma",
-      "--list",
-      "infra_internal/goma/client/windows-amd64 release",
-      "--json-output",
-      "/path/to/tmp/json",
-      "--service-account-json",
-      "C:\\creds\\service_accounts\\service-account-goma-client.json"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ensure_goma.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
     "cmd": [
       "python",
       "-u",
@@ -195,7 +138,7 @@
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "GYP_CHROMIUM_NO_ACTION": "1",
-      "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]\\cipd\\goma' internal_gles2_conform_tests=1 proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
+      "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' internal_gles2_conform_tests=1 proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks (with patch)"