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

scripts/slave/recipes/android/android_builder.py

Index: scripts/slave/recipes/android/android_builder.py
diff --git a/scripts/slave/recipes/android/android_builder.py b/scripts/slave/recipes/android/android_builder.py
index 61e16c30e20bdafe1c734afb505c20a7e2243745..2077ff0196f5252f06b1542d2377edf8754b0c18 100644
--- a/scripts/slave/recipes/android/android_builder.py
+++ b/scripts/slave/recipes/android/android_builder.py
@@ -5,6 +5,7 @@
 DEPS = [
   'chromium_android',
   'properties',
+  'json',
 ]
 
 def GenSteps(api):
@@ -29,41 +30,37 @@ def GenSteps(api):
 def GenTests(api):
   bot_ids = ['main_builder', 'component_builder', 'clang_builder',
              'x86_builder', 'klp_builder', 'try_builder']
-  def _common_step_mocks():
-    return {
-      'get app_manifest_vars': {
-        'json': {
-          'output': {
-            'version_code': 10,
-            'version_name': 'some_builder_1234',
-            'build_id': 3333,
-            'date_string': 6001
-          }
-        }
-      },
-      'envsetup': {
-        'json': {
-          'output': {
-            'PATH': './',
-            'GYP_DEFINES': 'my_new_gyp_def=aaa',
-            'GYP_SOMETHING': 'gyp_something_value'
-          }
-        }
-      }
-    }
 
   for bot_id in bot_ids:
-    props = {
-            'repo_name': 'src/repo',
-            'repo_url': 'svn://svn.chromium.org/chrome/trunk/src',
-            'revision': '4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00',
-            'android_bot_id': bot_id,
-            'buildername': 'builder_name',
-            'internal': True
-    }
+    props = api.properties(
+      repo_name='src/repo',
+      repo_url='svn://svn.chromium.org/chrome/trunk/src',
+      revision='4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00',
+      android_bot_id=bot_id,
+      buildername='builder_name',
+      internal=True
+    )
     if bot_id == 'try_builder':
-      props['revision'] = ''
-    yield bot_id, {
-        'properties': props,
-        'step_mocks': _common_step_mocks()
-    }
+      props += api.properties(revision='')
+
+    yield (
+      api.test(bot_id) +
+      props +
+      api.step_data(
+        'get app_manifest_vars',
+        api.json.output({
+          'version_code': 10,
+          'version_name': 'some_builder_1234',
+          'build_id': 3333,
+          'date_string': 6001
+        })
+      ) +
+      api.step_data(
+        'envsetup',
+        api.json.output({
+          'PATH': './',
+          'GYP_DEFINES': 'my_new_gyp_def=aaa',
+          'GYP_SOMETHING': 'gyp_something_value'
+        })
+      )
+    )