Cleanup: Remove the remaining instances of ChromiumTestShell from Telemetry scripts.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # 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.
 
 import collections
 import glob
 import hashlib
 import json
 import os
@@ skipping 130 matching lines @@
           '--update-log'])
 
 
 def RunTelemetryPerfUnitTests(options):
   """Runs the telemetry perf unit tests.
 
   Args:
     options: options object.
   """
   InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False)
-  args = ['--browser', 'android-chromium-testshell']
+  args = ['--browser', 'android-chrome-shell']
   devices = android_commands.GetAttachedDevices()
   if devices:
     args = args + ['--device', devices[0]]
   bb_annotations.PrintNamedStep('telemetry_perf_unittests')
   RunCmd(['tools/perf/run_tests'] + args)
 
 
 def RunMojoTests(options):
   """Runs the mojo unit tests.
 
@@ skipping 499 matching lines @@
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))