[Android] Fix flakiness dashbaord reporting for gtests.

build/android/pylib/results/report_results.py

 # Copyright (c) 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.
 
 """Module containing utility functions for reporting results."""
 
 import logging
 import os
 import re
 
@@ skipping 22 matching lines @@
                                  results.GetShortForm())
 
 
 def _LogToFlakinessDashboard(results, test_type, test_package,
                              flakiness_server):
   """Upload results to the flakiness dashboard"""
   logging.info('Upload results for test type "%s", test package "%s" to %s',
                test_type, test_package, flakiness_server)
 
   try:
-    if test_type == 'Instrumentation':
+    # TODO(jbudorick): remove Instrumentation once instrumentation tests
+    # switch to platform mode.
+    if test_type in ('instrumentation', 'Instrumentation'):
       if flakiness_server == constants.UPSTREAM_FLAKINESS_SERVER:
         assert test_package in ['ContentShellTest',
                                 'ChromePublicTest',
                                 'ChromeSyncShellTest',
                                 'AndroidWebViewTest']
         dashboard_test_type = ('%s_instrumentation_tests' %
                                test_package.lower().rstrip('test'))
       # Downstream server.
       else:
         dashboard_test_type = 'Chromium_Android_Instrumentation'
 
-    elif test_type == 'Unit test':
+    elif test_type == 'gtest':
       dashboard_test_type = test_package
 
     else:
       logging.warning('Invalid test type')
       return
 
     results_uploader.Upload(
         results, flakiness_server, dashboard_test_type)
 
   except Exception: # pylint: disable=broad-except
@@ skipping 38 matching lines @@
     # instrumenation test package using different annotations.
     if annotation and len(annotation) == 1:
       suite_name = annotation[0]
     else:
       suite_name = test_package
     _LogToFile(results, test_type, suite_name)
 
     if flakiness_server:
       _LogToFlakinessDashboard(results, test_type, test_package,
                                flakiness_server)