Add support for cc_perftests and other non-telemetry gtest based tests.

scripts/slave/recipes/android/perf.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 infra.libs.infra_types import freeze
 
 DEPS = [
     'adb',
     'bot_update',
     'chromium',
@@ skipping 111 matching lines @@
   api.chromium_android.common_tests_setup_steps()
 
   api.chromium_android.adb_install_apk(
       'ChromeShell.apk',
       'org.chromium.chrome.shell')
 
   perf_tests = api.chromium.list_perf_tests(
       browser='android-chrome-shell',
       num_shards=builder['num_device_shards'],
       devices=api.chromium_android.devices[0:1]).json.output
-
+  perf_gtests = api.chromium.list_gtest_perf_tests(
+      api.properties['buildername']).json.output
   try:
     api.chromium_android.run_sharded_perf_tests(
       config=api.json.input(data=perf_tests),
       perf_id=builder['perf_id'],
       chartjson_file=True)
-
+    api.chromium_android.run_other_gtests(
+      perf_gtests,
+      perf_id=builder['perf_id'])
   finally:
     api.chromium_android.common_tests_final_steps()
 
 def _sanitize_nonalpha(text):
   return ''.join(c if c.isalnum() else '_' for c in text)
 
 def GenTests(api):
   for mastername, builders in BUILDERS.iteritems():
     for buildername in builders:
       yield (
           api.test('full_%s_%s' % (_sanitize_nonalpha(mastername),
                                    _sanitize_nonalpha(buildername))) +
           api.properties.generic(
               repo_name='src',
               repo_url=REPO_URL,
               mastername=mastername,
               buildername=buildername,
               parent_buildername='parent_buildername',
               parent_buildnumber='1729',
               parent_revision='deadbeef',
               revision='deadbeef',
               slavename='slavename',
               target='Release'))
   yield (api.test('provision_devices') +
       api.properties.generic(
           repo_name='src',
-              repo_url=REPO_URL,
-              mastername='chromium.perf',
-              buildername='Android Nexus5 Perf',
-              parent_buildername='parent_buildername',
-              parent_buildnumber='1729',
-              parent_revision='deadbeef',
-              revision='deadbeef',
-              slavename='slavename',
-              target='Release')
+          repo_url=REPO_URL,
+          mastername='chromium.perf',
+          buildername='Android Nexus5 Perf',
+          parent_buildername='parent_buildername',
+          parent_buildnumber='1729',
+          parent_revision='deadbeef',
+          revision='deadbeef',
+          slavename='slavename',
+          target='Release')
       + api.step_data('provision_devices', retcode=1))
+
+  yield (
+    api.test('gtest_failure') +
+    api.properties.generic(repo_name='src',
+                           repo_url=REPO_URL,
+                           mastername='chromium.perf',
+                           buildername='Android Nexus5 Perf',
+                           parent_buildername='Linux parent_buildername',
+                           parent_buildnumber='1729',
+                           parent_revision='deadbeef',
+                           revision='deadbeef',
+                           slavename='slavename',
+                           target='Release') +
+    api.override_step_data(
+        'cc_perftests',
+        api.json.output([]),
+        retcode=1)
+  )