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

scripts/slave/unittests/telemetry_test.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.
 
 """Unit tests for telemetry.py.
 
 This is a basic check that telemetry.py forms commands properly.
 
 """
@@ skipping 69 matching lines @@
         '\'%s\' ' % sys.executable +
         '\'%s\' \'--run-python-script\' \'--target\' \'Release\' ' % runtest +
             '\'--build-dir\' \'src/build\' \'--no-xvfb\' ' +
             '\'--factory-properties=' +
             '{"page_set": "sunspider.json", "target": "Release", ' +
             '"build_dir": "src/build", "perf_id": "android-gn", ' +
             '"step_name": "sunspider", "test_name": "sunspider", ' +
             '"target_platform": "linux2", "target_os": "android", ' +
             '"show_perf_results": true}\' ' +
             '\'src/tools/perf/run_measurement\' \'-v\' ' +
-            '\'--browser=android-content-shell\' \'sunspider\' ' +
+            '\'--browser=android-chromium-testshell\' \'sunspider\' ' +
             '\'src/tools/perf/page_sets/sunspider.json\''
         ])
 
     self.assertEqual(expectedText, self.capture.text)
 
   def testPageRepeat(self):
     fp = self._GetDefaultFactoryProperties()
     fp['page_repeat'] = 20
 
     cmd = [self.telemetry, '--print-cmd',
@@ skipping 11 matching lines @@
             '\'--build-dir\' \'src/build\' \'--no-xvfb\' ' +
             '\'--factory-properties=' +
             '{"page_set": "sunspider.json", "target": "Release", ' +
             '"build_dir": "src/build", "perf_id": "android-gn", ' +
             '"step_name": "sunspider", "test_name": "sunspider", ' +
             '"page_repeat": 20, '+
             '"target_platform": "linux2", "target_os": "android", ' +
             '"show_perf_results": true}\' ' +
             '\'src/tools/perf/run_measurement\' \'-v\' ' +
             '\'--page-repeat=20\' '+
-            '\'--browser=android-content-shell\' \'sunspider\' ' +
+            '\'--browser=android-chromium-testshell\' \'sunspider\' ' +
             '\'src/tools/perf/page_sets/sunspider.json\''
         ])
 
     self.assertEqual(expectedText, self.capture.text)
 
   def testPageRepeatMozJS(self):
     fp = self._GetDefaultFactoryProperties()
     fp['page_repeat'] = 20
     fp['page_set'] = 'moz.json'
     fp['target_os'] = 'mac'
 
     cmd = [self.telemetry, '--print-cmd',
            '--factory-properties=%s' % json.dumps(fp)]
 
     ret = runScript(cmd, filter_obj=self.capture, print_cmd=False)
     self.assertEqual(ret, 0)
 
     capture_text = self.capture.text
     self.assertEqual(len(capture_text), 4)
     for line in capture_text:
       self.assertEqual(line.count('moz.json'), 2)
 
 if __name__ == '__main__':
   unittest.main()