Rename chromium_testshell target to chrome_shell_apk.

build/android/pylib/utils/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 30 matching lines @@
                (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',
-                                'ChromiumTestShellTest',
+                                'ChromeShellTest',
                                 'AndroidWebViewTest']
         dashboard_test_type = ('%s_instrumentation_tests' %
                                test_package.lower().rstrip('test'))
     # Downstream server.
     else:
       dashboard_test_type = 'Chromium_Android_Instrumentation'
 
     flakiness_dashboard_results_uploader.Upload(
         results, flakiness_server, dashboard_test_type)
   except Exception as e:
@@ 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)