Update from https://crrev.com/316786

build/android/pylib/perf/test_runner.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.
 
 """Runs perf tests.
 
 Our buildbot infrastructure requires each slave to run steps serially.
 This is sub-optimal for android, where these steps can run independently on
 multiple connected devices.
 
@@ skipping 51 matching lines @@
 from pylib import constants
 from pylib import forwarder
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.device import device_errors
 
 
 def OutputJsonList(json_input, json_output):
   with file(json_input, 'r') as i:
     all_steps = json.load(i)
-  step_names = all_steps['steps'].keys()
+  step_values = [{'test': k, 'device_affinity': v['device_affinity']}
+      for k, v in all_steps['steps'].iteritems()]
   with file(json_output, 'w') as o:
-    o.write(json.dumps(step_names))
+    o.write(json.dumps(step_values))
   return 0
 
 
 def PrintTestOutput(test_name, json_file_name=None):
   """Helper method to print the output of previously executed test_name.
 
   Args:
     test_name: name of the test that has been previously executed.
     json_file_name: name of the file to output chartjson data to.
 
@@ skipping 242 matching lines @@
     Returns:
       A tuple of (TestRunResults, retry).
     """
     _, result_type = self._LaunchPerfTest(test_name)
     results = base_test_result.TestRunResults()
     results.AddResult(base_test_result.BaseTestResult(test_name, result_type))
     retry = None
     if not results.DidRunPass():
       retry = test_name
     return results, retry