[Android] Add option to run perf tests in platform mode.

scripts/slave/recipe_modules/chromium_android/api.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.
 
 import contextlib
 import datetime
 import json
 import os
 import re
 import sys
@@ skipping 584 matching lines @@
         env={'BUILDTYPE': self.c.BUILD_CONFIG},
         **kwargs)
 
 
   def _run_sharded_tests(self,
                          config='sharded_perf_tests.json',
                          flaky_config=None,
                          chartjson_output=False,
                          max_battery_temp=None,
                          known_devices_file=None,
+                         enable_platform_mode=False,
                          **kwargs):
     args = [
         'perf',
         '--release',
         '--verbose',
         '--steps', config,
         '--blacklist-file', self.blacklist_file
     ]
     if flaky_config:
       args.extend(['--flaky-steps', flaky_config])
     if chartjson_output:
       args.append('--collect-chartjson-data')
     if max_battery_temp:
       args.extend(['--max-battery-temp', max_battery_temp])
     if known_devices_file:
       args.extend(['--known-devices-file', known_devices_file])
+    if enable_platform_mode:
+      args.extend(['--enable-platform-mode'])
 
     self.test_runner(
         'Sharded Perf Tests',
         args,
         cwd=self.m.path['checkout'],
         env=self.m.chromium.get_env(),
         **kwargs)
 
   def run_sharded_perf_tests(self, config, flaky_config=None, perf_id=None,
                              test_type_transform=lambda x: x,
                              chartjson_file=False, max_battery_temp=None,
                              upload_archives_to_bucket=None,
-                             known_devices_file=None, **kwargs):
+                             known_devices_file=None,
+                             enable_platform_mode=False, **kwargs):
     """Run the perf tests from the given config file.
 
     config: the path of the config file containing perf tests.
     flaky_config: optional file of tests to avoid.
     perf_id: the id of the builder running these tests
     test_type_transform: a lambda transforming the test name to the
       test_type to upload to.
     known_devices_file: Path to file containing serial numbers of known devices.
+    enable_platform_mode: If set, will run in new platform mode for android test

[jbudorick, 2016/07/13 18:06:13]

nit: "will run using the android test runner's new platform mode" or something

[rnephew (Reviews Here), 2016/07/13 20:45:54]

Done.

+      runner.
     """
     # test_runner.py actually runs the tests and records the results
     self._run_sharded_tests(config=config, flaky_config=flaky_config,
                             chartjson_output=chartjson_file,
                             max_battery_temp=max_battery_temp,
-                            known_devices_file=known_devices_file, **kwargs)
+                            known_devices_file=known_devices_file,
+                            enable_platform_mode=enable_platform_mode, **kwargs)
 
     # now obtain the list of tests that were executed.
     result = self.test_runner(
         'get perf test list',
         ['perf', '--steps', config, '--output-json-list', self.m.json.output(),
          '--blacklist-file', self.blacklist_file],
         step_test_data=lambda: self.m.json.test_api.output([
             {'test': 'perf_test.foo', 'device_affinity': 0,
              'end_time': 1443438432.949711, 'has_archive': True},
             {'test': 'page_cycler.foo', 'device_affinity': 0}]),
@@ skipping 14 matching lines @@
       annotate = self.m.chromium.get_annotate_by_test_name(test_name)
 
       if upload_archives_to_bucket and test_data.get('has_archive'):
         archive = self.m.path.mkdtemp('perf_archives').join('output_dir.zip')
       else:
         archive = None
       print_step_cmd = ['perf', '--print-step', test_name, '--verbose',
                         '--blacklist-file', self.blacklist_file]
       if archive:
         print_step_cmd.extend(['--get-output-dir-archive', archive])
+      if enable_platform_mode:
+        print_step_cmd.extend(['--enable-platform-mode'])
 
       try:
         with self.handle_exit_codes():
           env = self.m.chromium.get_env()
           env['CHROMIUM_OUTPUT_DIR'] = self.m.chromium.output_dir
           self.m.chromium.runtest(
             self.c.test_runner,
             print_step_cmd,
             name=test_name,
             perf_dashboard_id=test_type,
@@ skipping 685 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)