Make perf android tests use devil adb

scripts/slave/recipe_modules/chromium_tests/steps.py

Index: scripts/slave/recipe_modules/chromium_tests/steps.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/steps.py b/scripts/slave/recipe_modules/chromium_tests/steps.py
index dc46acce93f43379834d2acc3d6866abf94ae84d..0c4dae34ad5466e22f0c79e40860533ffc89ab4c 100644
--- a/scripts/slave/recipe_modules/chromium_tests/steps.py
+++ b/scripts/slave/recipe_modules/chromium_tests/steps.py
@@ -579,6 +579,10 @@ class DynamicPerfTests(Test):
   def uses_local_devices(self):
     return True
 
+  def pre_run(self, api, suffix):
+    if self._platform == 'android':
+      api.chromium_android.use_devil_adb()

[jbudorick, 2016/11/11 22:47:57]

This happens too late.

+
   def run(self, api, suffix, test_filter=None):
     tests = self._test_list(api)
 
@@ -594,10 +598,15 @@ class DynamicPerfTests(Test):
     else:
       device = None
 
+    # Don't want to clutter up the command line if we're not on android.
+    pass_adb_path = False
+    if self._platform == 'android' and self._pass_adb_path:
+      pass_adb_path = True
+
     tests = api.chromium.list_perf_tests(
         browser=self._browser_name,
         num_shards=self._num_host_shards * self._num_device_shards,
-        device=device).json.output
+        device=device, pass_adb_path=pass_adb_path).json.output
 
     tests['steps'] = {k: v for k, v in tests['steps'].iteritems()
         if v['device_affinity'] / self._num_device_shards == self._shard_index}