Android / Telemetry: use android-chromium-testshell instead of content-shell.

scripts/slave/telemetry.py

 #! /usr/bin/env python
 # 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.
 
 """Set up and invoke telemetry tests."""
 
 import json
 import optparse
 import os
@@ skipping 112 matching lines @@
     commands.append(ref_cmd)
 
   return commands, env
 
 
 def main(argv):
   prog_desc = 'Invoke telemetry performance tests.'
   parser = optparse.OptionParser(usage=('%prog [options]' + '\n\n' + prog_desc))
   parser.add_option('--print-cmd', action='store_true',
                     help='only print command instead of running it')
-  parser.add_option('--target-android-browser', default='android-content-shell',
+  parser.add_option('--target-android-browser',
+                    default='android-chromium-testshell',
                     help='target browser used on Android')
   parser.add_option('--factory-properties', action='callback',
                     callback=chromium_utils.convert_json, type='string',
                     nargs=1, default={},
                     help='factory properties in JSON format')
 
   options, _ = parser.parse_args(argv[1:])
   if not options.factory_properties:
     print 'This program requires a factory properties to run.'
     return 1
 
   commands, env = _GenerateTelemetryCommandSequence(options)
 
   retval = 0
   for command in commands:
     if options.print_cmd:
       print ' '.join("'%s'" % c for c in command)
       continue
 
     retval = chromium_utils.RunCommand(command, env=env)
     if retval != 0:
       break
   return retval
 
 
 if '__main__' == __name__:
   sys.exit(main(sys.argv))