Stop to use contextmanager for goma.build_with_goma

scripts/slave/recipes/swarming/staging.expected/android.json

Index: scripts/slave/recipes/swarming/staging.expected/android.json
diff --git a/scripts/slave/recipes/swarming/staging.expected/android.json b/scripts/slave/recipes/swarming/staging.expected/android.json
index 68724991325f3da530f09731eb7d9d433cf49d4a..8b93dd9aaea39ab118df813017944f3b08ab8dd4 100644
--- a/scripts/slave/recipes/swarming/staging.expected/android.json
+++ b/scripts/slave/recipes/swarming/staging.expected/android.json
@@ -217,33 +217,6 @@
     "name": "clean isolated files"
   },
   {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport multiprocessing\nimport sys\n\njob_limit = 200\nif sys.platform.startswith('linux'):\n  # Use 80 for linux not to load goma backend.\n  job_limit = 80\n\ntry:\n  jobs = min(job_limit, multiprocessing.cpu_count() * 10)\nexcept NotImplementedError:\n  jobs = 50\n\nprint jobs\n"
-    ],
-    "name": "calculate the number of recommended jobs",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@import multiprocessing@@@",
-      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@job_limit = 200@@@",
-      "@@@STEP_LOG_LINE@python.inline@if sys.platform.startswith('linux'):@@@",
-      "@@@STEP_LOG_LINE@python.inline@  # Use 80 for linux not to load goma backend.@@@",
-      "@@@STEP_LOG_LINE@python.inline@  job_limit = 80@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@try:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  jobs = min(job_limit, multiprocessing.cpu_count() * 10)@@@",
-      "@@@STEP_LOG_LINE@python.inline@except NotImplementedError:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  jobs = 50@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@print jobs@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "preprocess_for_goma"
   },
@@ -287,13 +260,38 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "\nimport multiprocessing\nimport sys\n\njob_limit = 200\nif sys.platform.startswith('linux'):\n  # Use 80 for linux not to load goma backend.\n  job_limit = 80\n\ntry:\n  jobs = min(job_limit, multiprocessing.cpu_count() * 10)\nexcept NotImplementedError:\n  jobs = 50\n\nprint jobs\n"
+    ],
+    "name": "calculate the number of recommended jobs",
+    "stdout": "/path/to/tmp/",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import multiprocessing@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@job_limit = 200@@@",
+      "@@@STEP_LOG_LINE@python.inline@if sys.platform.startswith('linux'):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  # Use 80 for linux not to load goma backend.@@@",
+      "@@@STEP_LOG_LINE@python.inline@  job_limit = 80@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  jobs = min(job_limit, multiprocessing.cpu_count() * 10)@@@",
+      "@@@STEP_LOG_LINE@python.inline@except NotImplementedError:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  jobs = 50@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@print jobs@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
       "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
       "-w",
       "dupbuild=err",
       "-C",
       "[SLAVE_BUILD]/src/out/Release",
-      "-j",
-      "50",
       "android_webview_test_apk_run",
       "android_webview_unittests_apk_run",
       "base_unittests_apk_run",
@@ -318,7 +316,9 @@
       "ui_android_unittests_apk_run",
       "ui_base_unittests_apk_run",
       "ui_touch_selection_unittests_apk_run",
-      "unit_tests_apk_run"
+      "unit_tests_apk_run",
+      "-j",
+      "50"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -389,7 +389,7 @@
       "--ninja-log-compiler",
       "goma",
       "--ninja-log-command",
-      "['RECIPE_PACKAGE_REPO[depot_tools]/ninja', '-w', 'dupbuild=err', '-C', '[SLAVE_BUILD]/src/out/Release', '-j', 50, 'android_webview_test_apk_run', 'android_webview_unittests_apk_run', 'base_unittests_apk_run', 'breakpad_unittests_apk_run', 'chrome_public_test_apk_run', 'chrome_sync_shell_test_apk_run', 'components_browsertests_apk_run', 'components_unittests_apk_run', 'content_browsertests_apk_run', 'content_shell_test_apk_run', 'content_unittests_apk_run', 'device_unittests_apk_run', 'events_unittests_apk_run', 'gl_tests_apk_run', 'gl_unittests_apk_run', 'gpu_unittests_apk_run', 'ipc_tests_apk_run', 'media_unittests_apk_run', 'net_unittests_apk_run', 'sandbox_linux_unittests_android_run', 'sql_unittests_apk_run', 'ui_android_unittests_apk_run', 'ui_base_unittests_apk_run', 'ui_touch_selection_unittests_apk_run', 'unit_tests_apk_run']",
+      "['RECIPE_PACKAGE_REPO[depot_tools]/ninja', '-w', 'dupbuild=err', '-C', '[SLAVE_BUILD]/src/out/Release', 'android_webview_test_apk_run', 'android_webview_unittests_apk_run', 'base_unittests_apk_run', 'breakpad_unittests_apk_run', 'chrome_public_test_apk_run', 'chrome_sync_shell_test_apk_run', 'components_browsertests_apk_run', 'components_unittests_apk_run', 'content_browsertests_apk_run', 'content_shell_test_apk_run', 'content_unittests_apk_run', 'device_unittests_apk_run', 'events_unittests_apk_run', 'gl_tests_apk_run', 'gl_unittests_apk_run', 'gpu_unittests_apk_run', 'ipc_tests_apk_run', 'media_unittests_apk_run', 'net_unittests_apk_run', 'sandbox_linux_unittests_android_run', 'sql_unittests_apk_run', 'ui_android_unittests_apk_run', 'ui_base_unittests_apk_run', 'ui_touch_selection_unittests_apk_run', 'unit_tests_apk_run', '-j', 50]",
       "--ninja-log-exit-status",
       "0",
       "--buildbot-buildername",