Refactor the way that TestApi works so that it is actually useful.

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 2013 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 slave import recipe_api
 
 class AndroidApi(recipe_api.RecipeApi):
   def __init__(self, **kwargs):
     super(AndroidApi, self).__init__(**kwargs)
     self._env = dict()
@@ skipping 31 matching lines @@
                     REPO_URL=repo_url,
                     BUILD_CONFIG=target)
 
     # TODO(sivachandra): Move the setting of the gclient spec below to an
     # internal config extension when they are supported by the recipe system.
     spec = self.m.gclient.make_config('android_bare')
     spec.target_os = ['android']
     s = spec.solutions[0]
     s.name = repo_name
     s.url = repo_url
-    s.custom_vars = self.c.custom_vars
     s.custom_deps = gclient_custom_deps or {}
     if revision:
       s.revision = revision
     else:
       s.revision = 'refs/remotes/origin/master'
 
     yield self.m.gclient.checkout(spec)
 
     # TODO(sivachandra): Manufacture gclient spec such that it contains "src"
     # solution + repo_name solution. Then checkout will be automatically
@@ skipping 10 matching lines @@
       if isinstance(val, list):
         gyp_defs[gyp_def] = self.m.path.checkout(*val)
 
     if internal:
       yield self.m.step(
           'get app_manifest_vars',
           [self.m.path.checkout(
                self._internal_dir, 'build', 'dump_app_manifest_vars.py'),
            '-b', self.m.properties['buildername'],
            '-v', self.m.path.checkout('chrome', 'VERSION'),
-           self.m.json.output()]
+           '--output-json', self.m.json.output()]
       )
 
       app_manifest_vars = self.m.step_history.last_step().json.output
       gyp_defs = self.m.chromium.c.gyp_env.GYP_DEFINES
       gyp_defs['app_manifest_version_code'] = app_manifest_vars['version_code']
       gyp_defs['app_manifest_version_name'] = app_manifest_vars['version_name']
       gyp_defs['chrome_build_id'] = app_manifest_vars['build_id']
 
   def envsetup(self):
     envsetup_cmd = [self.m.path.checkout('build', 'android', 'envsetup.sh')]
     if self.c.target_arch:
       envsetup_cmd += ['--target-arch=%s' % self.c.target_arch]
 
     cmd = ([self.m.path.checkout('build', 'env_dump.py'),
-            self.m.json.output()] + envsetup_cmd)
+            '--output-json', self.m.json.output()] + envsetup_cmd)
     yield self.m.step('envsetup', cmd, env=self.get_env())
 
     env_diff = self.m.step_history.last_step().json.output
     for key, value in env_diff.iteritems():
       if key.startswith('GYP_'):
         continue
       else:
         self._env[key] = value
 
   def clean_local_files(self):
@@ skipping 16 matching lines @@
 
   def run_tree_truth(self, show_revisions=False):
     # TODO(sivachandra): The downstream ToT builder will require
     # 'Show Revisions' step.
     repos = ['src', 'src-internal']
     if self.c.REPO_NAME not in repos:
       repos.append(self.c.REPO_NAME)
     # TODO(sivachandra): Disable subannottations after cleaning up
     # tree_truth.sh.
     yield self.m.step('tree truth steps',
-                      [self.m.path.checkout('build', 'tree_truth.sh'), 
+                      [self.m.path.checkout('build', 'tree_truth.sh'),
                        self.m.path.checkout()] + repos,
                       allow_subannottations=True)
 
   def runhooks(self):
     run_hooks_env = self.get_env()
     if self.m.properties.get('internal'):
       run_hooks_env['EXTRA_LANDMINES_SCRIPT'] = self.m.path.checkout(
           self._internal_dir, 'build', 'get_internal_landmines.py')
     return self.m.chromium.runhooks(env=run_hooks_env)
 
@@ skipping 15 matching lines @@
       [self.m.path.checkout('tools', 'checkdeps', 'checkdeps.py'),
        '--root=%s' % self._internal_dir],
       env=self.get_env())
 
   def lint(self):
     if self.c.INTERNAL:
       return self.m.step(
           'lint',
           [self.m.path.checkout(self._internal_dir, 'bin', 'lint.py')],
           env=self.get_env())