goma: back to build-provided client and disable oauth2

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

Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang64_dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang64_dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang64_dbg_.json
index aa87ae7f25a7598c4b9c9ccff74da6e90da6fd8d..dc7d6b92ee30f624df1dcb08dd63e94e125d97c3 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang64_dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang64_dbg_.json
@@ -107,63 +107,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",
@@ -187,7 +130,7 @@
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "GYP_CHROMIUM_NO_ACTION": "1",
-      "GYP_DEFINES": "clang=1 component=shared_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
+      "GYP_DEFINES": "clang=1 component=shared_library fastbuild=1 gomadir='[BUILD]\\goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
@@ -287,7 +230,7 @@
       "--config-file",
       "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
       "--goma-dir",
-      "[CACHE]\\cipd\\goma",
+      "[BUILD]\\goma",
       "--swarming-targets-file",
       "browser_tests\n",
       "//out/Debug_x64"
@@ -345,10 +288,8 @@
       "goma-clang",
       "--goma-jsonstatus",
       "/path/to/tmp/json",
-      "--goma-service-account-json-file",
-      "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "--goma-dir",
-      "[CACHE]\\cipd\\goma",
+      "[BUILD]\\goma",
       "--",
       "all"
     ],