| Index: build/android/buildbot/bb_device_steps.py
 | 
| diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
 | 
| index a93c0d7401be59ee8561c3fba6b9850d8bb05fa2..c6e5f268128b24a8b473683e95a5ab05dd204ac4 100755
 | 
| --- a/build/android/buildbot/bb_device_steps.py
 | 
| +++ b/build/android/buildbot/bb_device_steps.py
 | 
| @@ -64,12 +64,12 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
 | 
|        'org.chromium.content_shell_apk',
 | 
|        'ContentShellTest',
 | 
|        'content:content/test/data/android/device_files'),
 | 
| -    I('ChromiumTestShell',
 | 
| -      'ChromiumTestShell.apk',
 | 
| +    I('ChromeShell',
 | 
| +      'ChromeShell.apk',
 | 
|        'org.chromium.chrome.shell',
 | 
| -      'ChromiumTestShellTest',
 | 
| +      'ChromeShellTest',
 | 
|        'chrome:chrome/test/data/android/device_files',
 | 
| -      constants.CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR),
 | 
| +      constants.CHROME_SHELL_HOST_DRIVEN_DIR),
 | 
|      I('AndroidWebView',
 | 
|        'AndroidWebView.apk',
 | 
|        'org.chromium.android_webview.shell',
 | 
| @@ -156,7 +156,7 @@ def RunChromeDriverTests(options):
 | 
|    bb_annotations.PrintNamedStep('chromedriver_annotation')
 | 
|    RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
 | 
|            '--android-packages=%s,%s,%s,%s' %
 | 
| -          ('chromium_test_shell',
 | 
| +          ('chrome_shell',
 | 
|             'chrome_stable',
 | 
|             'chrome_beta',
 | 
|             'chromedriver_webview_shell'),
 | 
| 
 |