Revert of Do not call run_webkit_tests.py in android buildbot scripts.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 import collections
 import glob
 import hashlib
 import json
 import os
 import random
 import re
 import shutil
 import sys
 
 import bb_utils
 import bb_annotations
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import provision_devices
 from pylib import android_commands
 from pylib import constants
 from pylib.device import device_utils
 from pylib.gtest import gtest_config
 
 CHROME_SRC_DIR = bb_utils.CHROME_SRC
 DIR_BUILD_ROOT = os.path.dirname(CHROME_SRC_DIR)
 CHROME_OUT_DIR = bb_utils.CHROME_OUT_DIR
-BK_SCRIPTS_DIR = 'third_party/WebKit/Tools/Scripts'
 
 SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave')
 LOGCAT_DIR = os.path.join(bb_utils.CHROME_OUT_DIR, 'logcat')
 GS_URL = 'https://storage.googleapis.com'
 GS_AUTH_URL = 'https://storage.cloud.google.com'
 
 # Describes an instrumation test suite:
 #   test: Name of test we're running.
 #   apk: apk to be installed.
 #   apk_package: package for the apk to be installed.
@@ skipping 240 matching lines @@
     # associated with it.
     args.append('--official-build')
 
   RunCmd(['build/android/test_runner.py', 'instrumentation'] + args,
          flunk_on_failure=flunk_on_failure)
 
 
 def RunWebkitLint(target):
   """Lint WebKit's TestExpectation files."""
   bb_annotations.PrintNamedStep('webkit_lint')
-  RunCmd([SrcPath(os.path.join(BK_SCRIPTS_DIR, 'lint-test-expectations')),
+  RunCmd([SrcPath('webkit/tools/layout_tests/run_webkit_tests.py'),
+          '--lint-test-files',
+          '--chromium',
           '--target', target])
 
 
 def RunWebkitLayoutTests(options):
   """Run layout tests on an actual device."""
   bb_annotations.PrintNamedStep('webkit_tests')
   cmd_args = [
       '--no-show-results',
       '--no-new-test-results',
       '--full-results-html',
@@ skipping 17 matching lines @@
   for f in options.factory_properties.get('additional_expectations', []):
     cmd_args.extend(
         ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)])
 
   # TODO(dpranke): Remove this block after
   # https://codereview.chromium.org/12927002/ lands.
   for f in options.factory_properties.get('additional_expectations_files', []):
     cmd_args.extend(
         ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)])
 
-  exit_code = RunCmd(
-      [SrcPath(os.path.join(BK_SCRIPTS_DIR, 'run-webkit-tests'))] + cmd_args)
+  exit_code = RunCmd([SrcPath('webkit/tools/layout_tests/run_webkit_tests.py')]
+                     + cmd_args)
   if exit_code == 255: # test_run_results.UNEXPECTED_ERROR_EXIT_STATUS
     bb_annotations.PrintMsg('?? (crashed or hung)')
   elif exit_code == 254: # test_run_results.NO_DEVICES_EXIT_STATUS
     bb_annotations.PrintMsg('?? (no devices found)')
   elif exit_code == 253: # test_run_results.NO_TESTS_EXIT_STATUS
     bb_annotations.PrintMsg('?? (no tests found)')
   else:
     full_results_path = os.path.join('..', 'layout-test-results',
                                      'full_results.json')
     if os.path.exists(full_results_path):
@@ skipping 393 matching lines @@
 
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))