Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a

build/android/pylib/utils/report_results.py

Index: build/android/pylib/utils/report_results.py
diff --git a/build/android/pylib/utils/report_results.py b/build/android/pylib/utils/report_results.py
index b13b9bc84303ddc4419a38e6bc3f5c371174173d..9841dc65c7d8f30cdd0205fcc11bc607ad9392fc 100644
--- a/build/android/pylib/utils/report_results.py
+++ b/build/android/pylib/utils/report_results.py
@@ -39,24 +39,28 @@ def _LogToFlakinessDashboard(results, test_type, test_package,
   logging.info('Upload results for test type "%s", test package "%s" to %s' %
                (test_type, test_package, flakiness_server))
 
-  # TODO(frankf): Enable uploading for gtests.
-  if test_type != 'Instrumentation':
-    logging.warning('Invalid test type.')
-    return
-
   try:
-    if flakiness_server == constants.UPSTREAM_FLAKINESS_SERVER:
-      assert test_package in ['ContentShellTest',
+    if test_type == 'Instrumentation':
+      if flakiness_server == constants.UPSTREAM_FLAKINESS_SERVER:
+        assert test_package in ['ContentShellTest',
                                 'ChromeShellTest',
-                              'AndroidWebViewTest']
-      dashboard_test_type = ('%s_instrumentation_tests' %
-                             test_package.lower().rstrip('test'))
-    # Downstream server.
+                                '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':
+      dashboard_test_type = test_package
+
     else:
-      dashboard_test_type = 'Chromium_Android_Instrumentation'
+      logging.warning('Invalid test type')
+      return
 
     flakiness_dashboard_results_uploader.Upload(
         results, flakiness_server, dashboard_test_type)
+
   except Exception as e:
     logging.error(e)