Take two at fixing android bots still using testlistjson.

Tools/TestResultServer/handlers/testfilehandler.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 33 matching lines @@
 PARAM_MASTER = "master"
 PARAM_BUILDER = "builder"
 PARAM_BUILD_NUMBER = "buildnumber"
 PARAM_DIR = "dir"
 PARAM_FILE = "file"
 PARAM_NAME = "name"
 PARAM_BEFORE = "before"
 PARAM_NUM_FILES = "numfiles"
 PARAM_KEY = "key"
 PARAM_TEST_TYPE = "testtype"
+PARAM_TEST_LIST_JSON = "testlistjson"
 PARAM_CALLBACK = "callback"
 
 
 def _replace_jsonp_callback(json, callback_name):
     if callback_name and re.search(r"^[A-Za-z0-9_]+$", callback_name):
         if re.search(r"^[A-Za-z0-9_]+[(]", json):
             return re.sub(r"^[A-Za-z0-9_]+[(]", callback_name + "(", json)
         return callback_name + "(" + json + ")"
 
     return json
@@ skipping 109 matching lines @@
 
     def get(self):
         key = self.request.get(PARAM_KEY)
         master = self.request.get(PARAM_MASTER)
         builder = self.request.get(PARAM_BUILDER)
         test_type = self.request.get(PARAM_TEST_TYPE)
         build_number = self.request.get(PARAM_BUILD_NUMBER, default_value=None)
         name = self.request.get(PARAM_NAME)
         before = self.request.get(PARAM_BEFORE)
         num_files = self.request.get(PARAM_NUM_FILES)
+        test_list_json = self.request.get(PARAM_TEST_LIST_JSON)
         callback_name = self.request.get(PARAM_CALLBACK)
 
         logging.debug(
             "Getting files, master %s, builder: %s, test_type: %s, build_number: %s, name: %s, before: %s.",
             master, builder, test_type, build_number, name, before)
 
         if key:
             json, date = self._get_file_content_from_key(key)
         elif num_files or not master or not builder or not test_type or (not build_number and not JsonResults.is_aggregate_file(name)) or not name:
             limit = int(num_files) if num_files else 100
             self._get_file_list(master, builder, test_type, build_number, name, before, limit, callback_name)
             return
         else:
             # FIXME: Stop using the old master name style after all files have been updated.
             master_data = master_config.getMaster(master)
             if not master_data:
                 master_data = master_config.getMasterByMasterName(master)
             if not master_data:
                 self.error(404)
                 return
+
             json, date = self._get_file_content(master_data['url_name'], builder, test_type, build_number, name)
             if json is None:
                 json, date = self._get_file_content(master_data['name'], builder, test_type, build_number, name)
 
+            if test_list_json:
+                json = JsonResults.get_test_list(builder, json)
+
         if json:
             json = _replace_jsonp_callback(json, callback_name)
 
         self._serve_json(json, date)
 
 
 class Upload(webapp2.RequestHandler):
     """Upload test results file to datastore."""
 
     def post(self):
@@ skipping 80 matching lines @@
 
 class UploadForm(webapp2.RequestHandler):
     """Show a form so user can upload a file."""
 
     def get(self):
         template_values = {
             "upload_url": "/testfile/upload",
         }
         self.response.out.write(template.render("templates/uploadform.html",
                                                 template_values))