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

scripts/slave/recipe_modules/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.
 
 """Common steps for recipes that sync/build Android sources."""
 
 from slave import recipe_api
 
 class AOSPApi(recipe_api.RecipeApi):
   def __init__(self, **kwargs):
@@ skipping 16 matching lines @@
   @property
   def slave_android_out_path(self):
     return self.m.path.slave_build(self.SLAVE_ANDROID_ROOT_NAME, 'out')
 
   @property
   def with_lunch_command(self):
     return [self.m.path.build('scripts', 'slave', 'android', 'with_lunch'),
             self.build_path,
             self.c.lunch_flavor]
 
+  @recipe_api.inject_test_data
+  def calculate_trimmed_deps(self):
+    return self.m.step(
+      'calculate trimmed deps',
+      [
+        self.m.path.checkout('android_webview', 'buildbot',
+                             'deps_whitelist.py'),
+        '--method', 'android_build',
+        '--path-to-deps', self.m.path.checkout('DEPS'),
+        self.m.json.output()
+      ],
+    )
+
   def chromium_with_trimmed_deps(self, use_revision=True):
     svn_revision = None
     if use_revision and 'revision' in self.m.properties:
       svn_revision = str(self.m.properties['revision'])
 
     spec = self.m.gclient.make_config('chromium_empty')
     spec.solutions[0].revision = svn_revision
     self.m.gclient.spec_alias = 'empty_deps'
     yield self.m.gclient.checkout(spec)
 
-    yield self.m.step(
-      'calculate trimmed deps',
-      [self.m.path.checkout('android_webview', 'buildbot', 'deps_whitelist.py'),
-       '--method', 'android_build',
-       '--path-to-deps', self.m.path.checkout('DEPS'),
-       self.m.json.output()])
+    yield self.calculate_trimmed_deps()
 
     spec = self.m.gclient.make_config('chromium_bare')
     deps_blacklist = self.m.step_history.last_step().json.output['blacklist']
     spec.solutions[0].custom_deps = deps_blacklist
     spec.solutions[0].revision = svn_revision
     spec.target_os = ['android']
     self.m.gclient.spec_alias = 'trimmed'
     yield self.m.gclient.checkout(spec)
     del self.m.gclient.spec_alias
 
@@ skipping 77 matching lines @@
                       envsetup +
                       compile_script +
                       targets +
                       ['--build-dir', self.m.path.slave_build()] +
                       ['--src-dir', src_dir] +
                       ['--build-tool', build_tool] +
                       ['--verbose'] +
                       compiler_option,
                       cwd=self.m.path.slave_build())