Make perf android tests use devil adb

scripts/slave/recipe_modules/chromium_tests/steps.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.
 
 import datetime
 import json
 import re
 import string
 
 
@@ skipping 561 matching lines @@
         self._browser_name ='release'
 
   @property
   def name(self):
     return 'dynamic_perf_tests'
 
   @property
   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)
 
     if self._num_device_shards == 1:
       self._run_serially(api, tests)
     else:
       self._run_sharded(api, tests)
 
   def _test_list(self, api):
     if self._platform == 'android':
       # Must have already called device_status_check().
       device = api.chromium_android.devices[0]
     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}
     for test_info in tests['steps'].itervalues():
       test_info['device_affinity'] %= self._num_device_shards
 
     return tests
 
   def _run_sharded(self, api, tests):
     api.chromium_android.run_sharded_perf_tests(
@@ skipping 1292 matching lines @@
           args=args)
       api.gsutil.upload(
           temp_output_dir.join(
               '%s-android-chrome.json' % timestamp_string),
           'chromium-annotated-tests', 'android')
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]