Stop to use contextmanager for goma.build_with_goma

scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json

Index: scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json
diff --git a/scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json b/scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json
index 1a445bf445886ee5a48ca5f15696bb9d342ab118..2772524d00aea59083b22abf06585d4215074c7d 100644
--- a/scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json
+++ b/scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json
@@ -200,33 +200,6 @@
     "name": "generate build files for chromeos"
   },
   {
-    "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"
   },
@@ -266,7 +239,36 @@
   },
   {
     "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": [
       "ninja",
+      "-j",
+      "50",
       "-C",
       "[SLAVE_BUILD]/src/out/Debug",
       "all",
@@ -275,9 +277,7 @@
       "cc",
       "cxx",
       "objc",
-      "objcxx",
-      "-j",
-      "50"
+      "objcxx"
     ],
     "name": "generate compilation database for chromeos",
     "stdout": "/path/to/tmp/"
@@ -345,7 +345,7 @@
       "--ninja-log-compiler",
       "goma",
       "--ninja-log-command",
-      "['ninja', '-C', Path('checkout', 'out','Debug'), 'all', '-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx', '-j', 50]",
+      "['ninja', '-j', 50, '-C', Path('checkout', 'out','Debug'), 'all', '-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx']",
       "--ninja-log-exit-status",
       "0",
       "--buildbot-buildername",
@@ -443,14 +443,14 @@
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
+      "-j",
+      "50",
       "-w",
       "dupbuild=err",
       "-C",
       "[SLAVE_BUILD]/src/out/Debug",
       "-k",
       "0",
-      "-j",
-      "50",
       "all"
     ],
     "env": {
@@ -521,7 +521,7 @@
       "--ninja-log-compiler",
       "goma-clang",
       "--ninja-log-command",
-      "['RECIPE_PACKAGE_REPO[depot_tools]/ninja', '-w', 'dupbuild=err', '-C', '[SLAVE_BUILD]/src/out/Debug', '-k', '0', '-j', 50, 'all']",
+      "['RECIPE_PACKAGE_REPO[depot_tools]/ninja', '-j', 50, '-w', 'dupbuild=err', '-C', '[SLAVE_BUILD]/src/out/Debug', '-k', '0', 'all']",
       "--ninja-log-exit-status",
       "0",
       "--buildbot-buildername",
@@ -612,6 +612,8 @@
   {
     "cmd": [
       "ninja",
+      "-j",
+      "50",
       "-C",
       "[SLAVE_BUILD]/src/out/Debug",
       "all",
@@ -620,9 +622,7 @@
       "cc",
       "cxx",
       "objc",
-      "objcxx",
-      "-j",
-      "50"
+      "objcxx"
     ],
     "name": "generate compilation database for linux",
     "stdout": "/path/to/tmp/"
@@ -690,7 +690,7 @@
       "--ninja-log-compiler",
       "goma",
       "--ninja-log-command",
-      "['ninja', '-C', Path('checkout', 'out','Debug'), 'all', '-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx', '-j', 50]",
+      "['ninja', '-j', 50, '-C', Path('checkout', 'out','Debug'), 'all', '-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx']",
       "--ninja-log-exit-status",
       "0",
       "--buildbot-buildername",