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

scripts/slave/recipes/android_webview_aosp.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.
 
-DEPS = ['android', 'properties', 'rietveld']
+DEPS = [
+  'android',
+  'path',
+  'properties',
+  'rietveld'
+]
 
 def GenSteps(api):
   droid = api.android
   droid.set_config('AOSP')
   yield droid.chromium_with_trimmed_deps()
   yield droid.lastchange_steps()
 
   if 'issue' in api.properties:
     yield api.rietveld.apply_issue(api.rietveld.calculate_issue_root())
 
   yield droid.repo_init_steps()
   yield droid.generate_local_manifest_step()
   yield droid.repo_sync_steps()
 
   yield droid.symlink_chromium_into_android_tree_step()
   yield droid.gyp_webview_step()
 
   # TODO(android): use api.chromium.compile for this
   yield droid.compile_step(
     build_tool='make-android',
     targets=['libwebviewchromium', 'android_webview_java'],
     use_goma=True)
 
 def GenTests(api):
-  def _common_step_mocks():
-    return {
-      'calculate trimmed deps': {
-        'json': {
-          'output': {
-            'blacklist': {
-              'src/blacklist/project/1': None,
-              'src/blacklist/project/2': None,
-            }
-          }
-        }
-      }
-    }
+  yield api.Test('basic') + api.properties.scheduled()
 
-  yield 'basic', {
-    'properties': api.properties_scheduled(),
-    'step_mocks': _common_step_mocks(),
-  }
+  yield (
+    api.Test('uses_android_repo') +
+    api.properties.scheduled() +
+    api.path.exists('[SLAVE_BUILD_ROOT]/android-src/.repo/repo/repo')
+  )
 
-  yield 'uses_android_repo', {
-    'properties': api.properties_scheduled(),
-    'step_mocks': _common_step_mocks(),
-    'mock' : {
-      'path': {
-        'exists': [
-          '[SLAVE_BUILD_ROOT]/android-src/.repo/repo/repo',
-        ]
-      }
-    }
-  }
+  yield (
+    api.Test('doesnt_sync_if_android_present') +
+    api.properties.scheduled() +
+    api.path.exists('[SLAVE_BUILD_ROOT]/android-src')
+  )
 
-  yield 'doesnt_sync_if_android_present', {
-    'properties': api.properties_scheduled(),
-    'step_mocks': _common_step_mocks(),
-    'mock' : {
-      'path': {
-        'exists': [
-          '[SLAVE_BUILD_ROOT]/android-src',
-        ]
-      }
-    }
-  }
+  yield (
+    api.Test('does_delete_stale_chromium') +
+    api.properties.scheduled() +
+    api.path.exists('[SLAVE_BUILD_ROOT]/android-src/external/chromium_org')
+  )
 
-  yield 'does_delete_stale_chromium', {
-    'properties': api.properties_scheduled(),
-    'step_mocks': _common_step_mocks(),
-    'mock' : {
-      'path': {
-        'exists': [
-          '[SLAVE_BUILD_ROOT]/android-src/external/chromium_org',
-        ]
-      }
-    }
-  }
+  yield (
+    api.Test('uses_goma_test') +
+    api.properties.scheduled() +
+    api.path.exists('[BUILD_ROOT]/goma')
+  )
 
-  yield 'uses_goma_test', {
-    'properties': api.properties_scheduled(),
-    'step_mocks': _common_step_mocks(),
-    'mock' : {
-      'path': {
-        'exists': [
-          '[BUILD_ROOT]/goma'
-        ]
-      }
-    }
-  }
+  yield api.Test('works_if_revision_not_present') + api.properties.generic()
 
-  yield 'works_if_revision_not_present', {
-    'properties': api.properties_generic(),
-    'step_mocks': _common_step_mocks(),
-  }
-
-  yield 'trybot', {
-    'properties': api.properties_tryserver(),
-    'step_mocks': _common_step_mocks(),
-  }
+  yield api.Test('trybot') + api.properties.tryserver()