Android: cleanup old perf sharding list.

All dependent patches have landed and cycled,
remove support for the old format.

BUG=378862

Review URL: https://codereview.chromium.org/326933003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278280 0039d316-1c4b-4281-b951-d872f2087c98

build/android/pylib/perf/setup.py

@@ -42,21 +42,6 @@ def _GetStepsDictFromSingleStep(test_options):
   }
   return steps_dict
 
-# TODO(bulach): remove once it rolls downstream, crbug.com/378862.
-def _GetStepsDictFromV0(steps_v0):
-  steps_dict = {
-    'version': 1,
-    'steps': {},
-  }
-  affinity = 0
-  for step in steps_v0:
-    steps_dict['steps'][step[0]] = {
-        'device_affinity': affinity,
-        'cmd': step[1],
-    }
-    affinity += 1
-  return steps_dict
-
 
 def _GetStepsDict(test_options):
   if test_options.single_step:
@@ -64,9 +49,6 @@ def _GetStepsDict(test_options):
   if test_options.steps:
     with file(test_options.steps, 'r') as f:
       steps = json.load(f)
-      # TODO(bulach): remove once it rolls downstream, crbug.com/378862.
-      if isinstance(steps, list):
-        return _GetStepsDictFromV0(steps)
 
       # Already using the new format.
       assert steps['version'] == 1

build/android/pylib/perf/test_runner.py

@@ -34,15 +34,6 @@ The JSON steps file contains a dictionary in the format:
   }
 }
 
-# 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:
 [
@@ -75,11 +66,7 @@ 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