Take two at fixing android bots still using testlistjson.

Tools/TestResultServer/model/jsonresults.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 485 matching lines @@
             return status_string, status_code
 
         return cls.update_file(builder, large_file, incremental_json, JSON_RESULTS_MAX_BUILDS)
 
     @classmethod
     def update_file(cls, builder, file, incremental_json, num_runs):
         new_results, status_code = cls.merge(builder, file.data, incremental_json, num_runs)
         if status_code != 200:
             return new_results, status_code
         return TestFile.save_file(file, new_results)
+
+    @classmethod
+    def _delete_results_and_times(cls, tests):
+        for key in tests.keys():
+            if key in (RESULTS_KEY, TIMES_KEY):
+                del tests[key]
+            else:
+                cls._delete_results_and_times(tests[key])
+
+    @classmethod
+    def get_test_list(cls, builder, json_file_data):
+        logging.debug("Loading test results json...")
+        json = cls._load_json(json_file_data)
+        if not json:
+            return None
+
+        logging.debug("Checking test results json...")
+
+        check_json_error_string = cls._check_json(builder, json)
+        if check_json_error_string:
+            return None
+
+        test_list_json = {}
+        tests = json[builder][TESTS_KEY]
+        cls._delete_results_and_times(tests)
+        test_list_json[builder] = {TESTS_KEY: tests}
+        return cls._generate_file_data(test_list_json)