[chromedriver] Rename chromedriver2 target names to remove '2'.

chrome/test/chromedriver/test/run_all_tests.py

 #!/usr/bin/env python
 # Copyright 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.
 
 """Runs all ChromeDriver end to end tests."""
 
 import optparse
 import os
 import platform
@@ skipping 89 matching lines @@
                            chrome=chrome,
                            chrome_version=chrome_version,
                            android_package=android_package,
                            verbose=verbose))
   if code:
     util.MarkBuildStepError()
   return code
 
 
 def RunCppTests(cpp_tests):
-  util.MarkBuildStepStart('chromedriver2_tests')
+  util.MarkBuildStepStart('chromedriver_tests')
   code = util.RunCommand([cpp_tests])
   if code:
     util.MarkBuildStepError()
   return code
 
 
 def DownloadChrome(version_name, revision, download_site):
   util.MarkBuildStepStart('download %s' % version_name)
   return archive.DownloadChrome(revision, util.MakeTempDir(), download_site)
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option(
       '', '--android-packages',
       help='Comma separated list of application package names, '
            'if running tests on Android.')
   # Option 'chrome-version' is for desktop only.
   parser.add_option(
       '', '--chrome-version',
       help='Version of chrome, e.g., \'HEAD\', \'27\', or \'26\'.'
            'Default is to run tests against all of these versions.'
            'Notice: this option only applies to desktop.')
   options, _ = parser.parse_args()
 
   exe_postfix = ''
   if util.IsWindows():
     exe_postfix = '.exe'
-  cpp_tests_name = 'chromedriver2_tests' + exe_postfix
-  server_name = 'chromedriver2_server' + exe_postfix
+  cpp_tests_name = 'chromedriver_tests' + exe_postfix
+  server_name = 'chromedriver' + exe_postfix
 
   required_build_outputs = [server_name]
   if not options.android_packages:
     required_build_outputs += [cpp_tests_name]
   build_dir = chrome_paths.GetBuildDir(required_build_outputs)
   constants.SetBuildType(os.path.basename(build_dir))
   print 'Using build outputs from', build_dir
 
   chromedriver = os.path.join(build_dir, server_name)
   platform_name = util.GetPlatformName()
@@ skipping 54 matching lines @@
       code2 = RunJavaTests(chromedriver, chrome=chrome_path,
                            chrome_version=version[0],
                            chrome_version_name='v%s' % version_name)
       code = code or code1 or code2
     cpp_tests = os.path.join(build_dir, cpp_tests_name)
     return RunCppTests(cpp_tests) or code
 
 
 if __name__ == '__main__':
   sys.exit(main())