[Android] Reland 'Keep track of unknown test results at the TestRunner layer.'

build/android/pylib/utils/flakiness_dashboard_results_uploader.py

 # Copyright (c) 2012 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.
 
 """Uploads the results to the flakiness dashboard server."""
 
 import logging
 import os
 import shutil
 import subprocess
@@ skipping 133 matching lines @@
     else:
       self._build_name = 'chromium-android'
       buildbot_branch = os.environ.get('BUILDBOT_BRANCH')
       if not buildbot_branch:
         buildbot_branch = 'master'
       self._master_name = '%s-%s' % (self._build_name, buildbot_branch)
 
     self._test_results_map = {}
 
   def AddResults(self, test_results):
+    # TODO(frankf): Differentiate between fail/crash/timeouts.
     conversion_map = [
         (test_results.ok, False,
             json_results_generator.JSONResultsGeneratorBase.PASS_RESULT),
         (test_results.failed, True,
             json_results_generator.JSONResultsGeneratorBase.FAIL_RESULT),
         (test_results.crashed, True,
-            "C"),
+            json_results_generator.JSONResultsGeneratorBase.FAIL_RESULT),
+        (test_results.timed_out, True,
+            json_results_generator.JSONResultsGeneratorBase.FAIL_RESULT),
         (test_results.unknown, True,
             json_results_generator.JSONResultsGeneratorBase.NO_DATA_RESULT),
         ]
 
     for results_list, failed, modifier in conversion_map:
       for single_test_result in results_list:
         test_result = json_results_generator.TestResult(
             test=single_test_result.name,
             failed=failed,
             elapsed_time=single_test_result.dur / 1000)
@@ skipping 36 matching lines @@
   """Reports test results to the flakiness dashboard for Chrome for Android.
 
   Args:
     flakiness_dashboard_server: the server to upload the results to.
     test_type: the type of the tests (as displayed by the flakiness dashboard).
     results: test results.
   """
   uploader = ResultsUploader(test_type)
   uploader.AddResults(results)
   uploader.Upload(flakiness_dashboard_server)