Android: cleanup old perf sharding list.

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 16 matching lines @@
       "device_affinity": int,
       "cmd": "script_to_execute foo"
     },
     "bar": {
       "device_affinity": int,
       "cmd": "script_to_execute bar"
     }
   }
 }
 
-# TODO(bulach): remove once it rolls downstream, crbug.com/378862.
-The OLD JSON steps file contains a dictionary in the format:
-[
-  ["step_name_foo", "script_to_execute foo"],
-  ["step_name_bar", "script_to_execute bar"]
-]
-
-This preserves the order in which the steps are executed.
-
 The JSON flaky steps file contains a list with step names which results should
 be ignored:
 [
   "step_name_foo",
   "step_name_bar"
 ]
 
 Note that script_to_execute necessarily have to take at least the following
 option:
   --device: the serial number to be passed to all adb commands.
@@ skipping 12 matching lines @@
 from pylib import cmd_helper
 from pylib import constants
 from pylib import forwarder
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 
 
 def OutputJsonList(json_input, json_output):
   with file(json_input, 'r') as i:
     all_steps = json.load(i)
-  # TODO(bulach): remove once it rolls downstream, crbug.com/378862.
-  if isinstance(all_steps, list):
-    step_names = [t[0] for t in all_steps]
-  else:
-    step_names = all_steps['steps'].keys()
+  step_names = all_steps['steps'].keys()
   with file(json_output, 'w') as o:
     o.write(json.dumps(step_names))
   return 0
 
 
 def PrintTestOutput(test_name):
   """Helper method to print the output of previously executed test_name.
 
   Args:
     test_name: name of the test that has been previously executed.
@@ skipping 203 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