Stop to use contextmanager for goma.build_with_goma

scripts/slave/recipes/chromium_codesearch.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from recipe_engine.types import freeze
 
 DEPS = [
   'chromium',
   'commit_position',
   'depot_tools/bot_update',
@@ skipping 92 matching lines @@
   args = LINUX_GN_ARGS if platform == 'linux' else CHROMEOS_GN_ARGS
   args.extend(['use_goma=true',
                'goma_dir="%s"' % api.goma.goma_dir])
   command = [gn_path, 'gen', debug_path, '--args=%s' % ' '.join(args)]
   api.step('generate build files for %s' % platform, command,
            cwd=api.path['checkout'])
   command = ['ninja', '-C', debug_path] + list(targets)
   # Add the parameters for creating the compilation database.
   command += ['-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx']
 
-  command += ['-j', api.goma.recommended_goma_jobs]
-
   with api.goma.build_with_goma(
       ninja_log_outdir=debug_path,
-      ninja_log_command=command,
-      ninja_log_compiler='goma'):
+      ninja_command=command,
+      ninja_log_compiler='goma') as (env_update, ninja_command):
     return api.step('generate compilation database for %s' % platform,
-                    command,
-                    stdout=api.raw_io.output())
+                    ninja_command,
+                    stdout=api.raw_io.output(),
+                    env=env_update)
 
 
 def RunSteps(api):
   buildername = api.properties.get('buildername')
 
   bot_config = SPEC.get('builders', {}).get(buildername)
   platform = bot_config.get('platform', 'linux')
 
   # Checkout the repositories that are either directly needed or should be
   # included in the source archive.
@@ skipping 144 matching lines @@
     api.test(
         'full_%s_fail' % _sanitize_nonalpha('ChromiumOS Codesearch')) +
     api.step_data('generate compilation database for chromeos',
                   stdout=api.raw_io.output('some compilation data')) +
     api.step_data('generate compilation database for linux',
                   stdout=api.raw_io.output('some compilation data')) +
     api.step_data('run translation_unit clang tool', retcode=2) +
     api.properties.generic(buildername='ChromiumOS Codesearch',
                            mastername='chromium.infra.cron')
   )