Remove build-type arg from Chromedriver tests.

scripts/slave/recipe_modules/chromedriver/api.py

 # Copyright 2016 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.
 
 from recipe_engine import recipe_api
 
 GS_CHROMEDRIVER_DATA_BUCKET = 'chromedriver-data'
 GS_PREBUILTS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/prebuilts'
 GS_SERVER_LOGS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/server_logs'
 
@@ skipping 102 matching lines @@
       del log[min(log.keys())]
     if commit_position not in log:
       log[commit_position] = bool(passed)
       self.upload_test_results_log(chromedriver_platform, log)
     else:
       raise self.m.step.StepFailure(
           'Results already exist for commit position %s' % commit_position)
 
   def _generate_test_command(self, script, chromedriver, log_path,
                             ref_chromedriver=None, android_package=None,
-                            build_type=None, verbose=None):
+                            verbose=None):
     cmd = [
       script, 
       '--chromedriver', chromedriver,
       '--log-path', str(log_path)
     ]
     if ref_chromedriver:
       cmd.extend(['--reference-chromedriver', ref_chromedriver])
-    if build_type:
-      cmd.extend(['--build-type', build_type])
     if verbose:
       cmd.extend(['--verbose'])
     if self.m.platform.is_linux:
       cmd = ['xvfb-run', '-a'] + cmd
     if android_package:
       cmd.extend(['--android-package', android_package])
     return cmd
 
   def run_python_tests(self, chromedriver, ref_chromedriver, chrome=None,
                        chrome_version_name=None, android_package=None,
-                       build_type=None, archive_server_log=True, **kwargs):
+                       archive_server_log=True, **kwargs):
     """Run the Chromedriver Python tests."""
     version_info = ''
     if chrome_version_name:
       version_info = '(%s)' % chrome_version_name
     with self.m.tempfile.temp_dir('server_log') as log_dir:
       server_log = log_dir.join('server_log')
       test_script_path = self.m.path['checkout'].join(
           'chrome', 'test', 'chromedriver', 'test', 'run_py_tests.py')
       self.m.step('python_tests%s' % version_info,
                   self._generate_test_command(
                       test_script_path, chromedriver, server_log,
                       ref_chromedriver=ref_chromedriver,
-                      android_package=android_package,
-                      build_type=build_type),
+                      android_package=android_package),
                   **kwargs)
       if archive_server_log:
         self.archive_server_log(server_log)
 
   def run_java_tests(self, chromedriver, chrome=None, chrome_version_name=None,
-                     android_package=None, build_type=None, verbose=False,
+                     android_package=None, verbose=False,
                      archive_server_log=True, **kwargs):
     """Run the Chromedriver Java tests."""
     version_info = ''
     if chrome_version_name:
       version_info = '(%s)' % chrome_version_name
     with self.m.tempfile.temp_dir('server_log') as log_dir:
       server_log = log_dir.join('server_log')
       test_script_path = self.m.path['checkout'].join(
           'chrome', 'test', 'chromedriver', 'test', 'run_java_tests.py')
       self.m.step('java_tests%s' % version_info,
                   self._generate_test_command(
                       test_script_path, chromedriver, server_log,
                       ref_chromedriver=None, android_package=android_package,
-                      build_type=build_type, verbose=verbose),
+                      verbose=verbose),
                   **kwargs)
       if archive_server_log:
         self.archive_server_log(server_log)
 
   def run_all_tests(self, android_packages=None, archive_server_logs=True):
     """Run all Chromedriver tests."""
     server_name = 'chromedriver'
     chromedriver = self.m.chromium.output_dir.join(server_name)
-    build_type = self.m.path.basename(self.m.chromium.output_dir)
 
     platform_name = self.m.platform.name
     if self.m.platform.is_linux and self.m.platform.bits == 64:
       platform_name = 'linux64'
     ref_chromedriver = self.m.path['checkout'].join(
         'chrome', 'test', 'chromedriver', 'third_party', 'java_tests',
         'reference_builds', 'chromedriver_%s' % platform_name)
 
     test_env = {'PATH': '%(PATH)s'}
     test_env['PATH'] = self.m.path.pathsep.join([
         test_env['PATH'],
         str(self.m.path['checkout'].join(
             'chrome', 'test', 'chromedriver', 'chrome'))])
     with self.m.step.defer_results():
       for package in android_packages or []:
         self.run_python_tests(chromedriver,
                               ref_chromedriver,
                               chrome_version_name=package,
                               android_package=package,
-                              build_type=build_type,
                               env=test_env,
                               archive_server_log=archive_server_logs)
         self.run_java_tests(chromedriver,
                             chrome_version_name=package,
                             android_package=package,
-                            build_type=build_type,
                             verbose=True,
                             env=test_env,
                             archive_server_log=archive_server_logs)