Fix more references to webkit's run_webkit_tests.py.

content/test/PRESUBMIT.py

Index: content/test/PRESUBMIT.py
diff --git a/content/test/PRESUBMIT.py b/content/test/PRESUBMIT.py
index 476e8e704ad03ec097964cec206a5d80b3d11ad6..8f07da562fd0a50931374cf9c08ca24caab57160 100644
--- a/content/test/PRESUBMIT.py
+++ b/content/test/PRESUBMIT.py
@@ -18,7 +18,7 @@ def LintTestFiles(input_api, output_api):
   tools_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
   src_dir = os.path.dirname(tools_dir)
 
-  # Set 'webkit/tools/layout_tests' in include path.
+  # Set 'content/test' in include path.
   python_paths = [
       current_dir,
       input_api.os_path.join(src_dir, 'tools', 'python')
@@ -29,8 +29,8 @@ def LintTestFiles(input_api, output_api):
   env['PYTHONPATH'] = input_api.os_path.pathsep.join(python_paths)
   args = [
       input_api.python_executable,
-      input_api.os_path.join(src_dir, 'webkit', 'tools', 'layout_tests',
-        'run_webkit_tests.py'), '--lint-test-files'
+      input_api.os_path.join(src_dir, 'third_party', 'WebKit', 'Tools',
+        'Scripts', 'run-webkit-tests'), '--lint-test-files'
   ]
   subproc = input_api.subprocess.Popen(
       args,
@@ -40,7 +40,7 @@ def LintTestFiles(input_api, output_api):
       stdout=input_api.subprocess.PIPE,
       stderr=input_api.subprocess.STDOUT)
   stdout_data = subproc.communicate()[0]

[Dirk Pranke, 2014/09/19 18:27:34]

If we're changing this at all, we might as well change lines 17-42 to just:

subproc = input_api.subprocess.Popen(
    [input_api.python_executable,
     input_api.os.path.join(src_dir, 'third_party', 'WebKit', 'Tools', 
                                        'Scripts', 'lint-test-expectations')],
    stdin=...,
    stdout=...,
    stderr=...)
stdout_data = ...

All of the path and environment manipulation is unnecessary.

-  # TODO(ukai): consolidate run_webkit_tests --lint-test-files reports.
+  # TODO(ukai): consolidate run-webkit-tests --lint-test-files reports.
   is_error = lambda line: (input_api.re.match('^Line:', line) or
                            input_api.re.search('ERROR Line:', line))
   error = filter(is_error, stdout_data.splitlines())