From a045a7ffb6975d31803fd0635a8c55e4d0f69d84 Mon Sep 17 00:00:00 2001
From: Kent Tamura <tkent@chromium.org>
Date: Wed, 25 Apr 2018 05:08:11 +0000
Subject: [PATCH] Add //third_party/blink/tools/run_web_tests.*,

which is the new name of run-webkit-tests.
This CL also replaces references to "run-webkit-tests" with
"run_web_tests.py".

* //blink/tools/run_layout_tests.py
 Show a message, and run run_web_tests.py.

* //BUILD.gn
 "webkit_layout_tests" doesn't need //third_party/WebKit/Tools/Scripts
 any longer.

* //testing/buildbot/gn_isolate_map.pyl
 Replace run-webkit-tests with run_web_tests.py.

* //third_party/blink/tools/run_web_tests.{bat,py}
 Added.

* //third_party/WebKit/Tools/Scripts/run-webkit-tests
 Show a message.

* Other files: Really trivial changes. In many files, this CL
  replaces "run-webkit-tests" with "run_web_tests.py" in comments or
  strings.

Note that we decided to rename LayoutTests to web_tests.
https://groups.google.com/a/chromium.org/forum/#!msg/blink-dev/KKNbuzj-3HY/H8FWgtKrBgAJ


Bug: 829697
Change-Id: I899457cb3bcdb306aa47843a4c767c5980d9edc0
Reviewed-on: https://chromium-review.googlesource.com/1025543
Commit-Queue: Kent Tamura <tkent@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Quinten Yearsley <qyearsley@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553452}
---
 BUILD.gn                                      |  1 -
 blink/tools/run_layout_tests.py               |  9 ++---
 chrome/test/mini_installer/test_installer.py  |  2 +-
 docs/accessibility/tests.md                   |  2 +-
 .../identifying_tests_that_depend_on_order.md |  8 ++---
 docs/testing/layout_test_baseline_fallback.md |  2 +-
 docs/testing/layout_tests.md                  | 36 ++++++++++---------
 docs/testing/layout_tests_in_content_shell.md |  6 ++--
 docs/testing/layout_tests_tips.md             |  2 +-
 docs/testing/web_platform_tests.md            |  2 +-
 docs/testing/writing_layout_tests.md          |  4 +--
 testing/buildbot/gn_isolate_map.pyl           |  4 +--
 testing/scripts/common.py                     |  2 +-
 .../LayoutTests/FlagExpectations/README.txt   |  4 +--
 .../disable-blink-features=RootLayerScrolling |  2 +-
 third_party/WebKit/LayoutTests/NeverFixTests  |  4 +--
 .../WebKit/LayoutTests/TestExpectations       |  2 +-
 .../pasteboard/file-input-files-access.html   |  2 +-
 ...l-listener-circular-ownership-expected.txt |  2 +-
 ...e-channel-listener-circular-ownership.html |  2 +-
 .../fast/events/select-element-expected.txt   |  2 +-
 .../fast/events/select-element.html           |  2 +-
 .../invalidation/svg/use-clipped-hit.svg      |  2 +-
 .../svg/custom/linking-a-03-b-all.svg         |  2 +-
 .../linking-a-03-b-preserveAspectRatio.svg    |  2 +-
 .../svg/custom/linking-a-03-b-transform.svg   |  2 +-
 .../linking-a-03-b-viewBox-transform.svg      |  2 +-
 .../svg/custom/linking-a-03-b-viewBox.svg     |  2 +-
 .../svg/custom/linking-a-03-b-viewTarget.svg  |  2 +-
 .../svg/custom/linking-a-03-b-zoomAndPan.svg  |  2 +-
 .../svg/custom/linking-uri-01-b.svg           |  2 +-
 .../LayoutTests/svg/custom/pan-direction.svg  |  2 +-
 .../LayoutTests/svg/custom/text-hit-test.svg  |  2 +-
 .../transition-end-event-helpers.js           |  2 +-
 .../value-setter-warnings-expected.txt        |  2 +-
 .../IIRFilter/iir-unstable-expected.txt       |  2 +-
 .../LayoutTests/webaudio/resources/audit.js   |  4 +--
 .../LayoutTests/webaudio/tools/README.md      |  2 +-
 .../webaudio/unit-tests/audit-expected.txt    |  2 +-
 .../unit-tests/audit-failures-expected.txt    |  2 +-
 .../WebKit/Tools/Scripts/run-webkit-tests     |  1 +
 .../blink/tools/blinkpy/common/exit_codes.py  |  2 +-
 .../tools/blinkpy/common/message_pool.py      |  2 +-
 .../blink/tools/blinkpy/style/checkers/png.py |  2 +-
 .../blinkpy/style/checkers/png_unittest.py    |  2 +-
 .../blinkpy/third_party/wpt/README.chromium   |  6 ++--
 .../blink/tools/blinkpy/w3c/test_importer.py  |  2 +-
 .../blinkpy/web_tests/bisect_test_ordering.py |  4 +--
 .../controllers/layout_test_finder.py         |  2 +-
 .../blinkpy/web_tests/run_webkit_tests.py     |  4 +--
 .../blink/tools/blinkpy/web_tests/try_flag.py |  4 +--
 .../blinkpy/web_tests/try_flag_unittest.py    |  2 +-
 .../tools/blinkpy/web_tests/views/printing.py |  6 ++--
 .../blink/tools/blinkruby/PrettyPatch.rb      |  2 +-
 .../tools/check_testharness_expected_pass.py  |  2 +-
 third_party/blink/tools/debug_web_tests       |  4 +--
 third_party/blink/tools/run_web_tests.bat     |  6 ++++
 third_party/blink/tools/run_web_tests.py      | 10 ++++++
 tools/bash-completion                         | 20 +++++------
 tools/imagediff/image_diff.cc                 |  2 +-
 tools/mb/mb_config.pyl                        |  2 +-
 61 files changed, 124 insertions(+), 103 deletions(-)
 create mode 100755 third_party/blink/tools/run_web_tests.bat
 create mode 100755 third_party/blink/tools/run_web_tests.py

diff --git a/BUILD.gn b/BUILD.gn
index b290afb5e1078e..ff2f6ff45105fd 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -957,7 +957,6 @@ if (!is_ios) {
       "//testing/scripts/run_isolated_script_test.py",
       "//testing/xvfb.py",
       "//third_party/WebKit/LayoutTests/",
-      "//third_party/WebKit/Tools/Scripts/",
       "//third_party/blink/perf_tests/",
       "//third_party/blink/tools/",
       "//third_party/pywebsocket/",
diff --git a/blink/tools/run_layout_tests.py b/blink/tools/run_layout_tests.py
index 46d8ad016d9a18..1d216fb1124c9c 100755
--- a/blink/tools/run_layout_tests.py
+++ b/blink/tools/run_layout_tests.py
@@ -4,16 +4,17 @@
 # found in the LICENSE file.
 
 """Wrapper around
-   third_party/WebKit/Tools/Scripts/run-webkit-tests"""
+   third_party/blink/tools/run_web_tests.py"""
 import os
 import subprocess
 import sys
 
 def main():
+    print '\n    Please use third_party/blink/tools/run_web_tests.*.  ' \
+        'This command will be removed.\n'
     src_dir = os.path.abspath(os.path.join(sys.path[0], '..', '..'))
-    script_dir=os.path.join(src_dir, "third_party", "WebKit", "Tools",
-                            "Scripts")
-    script = os.path.join(script_dir, 'run-webkit-tests')
+    script_dir=os.path.join(src_dir, "third_party", "blink", "tools")
+    script = os.path.join(script_dir, 'run_web_tests.py')
     cmd = [sys.executable, script] + sys.argv[1:]
     return subprocess.call(cmd)
 
diff --git a/chrome/test/mini_installer/test_installer.py b/chrome/test/mini_installer/test_installer.py
index 216da0b314874c..de9894505f7dfb 100644
--- a/chrome/test/mini_installer/test_installer.py
+++ b/chrome/test/mini_installer/test_installer.py
@@ -570,7 +570,7 @@ def main():
 def _FullResults(suite, result, metadata):
   """Convert the unittest results to the Chromium JSON test result format.
 
-  This matches run-webkit-tests (the layout tests) and the flakiness dashboard.
+  This matches run_web_tests.py (the layout tests) and the flakiness dashboard.
   """
 
   full_results = {}
diff --git a/docs/accessibility/tests.md b/docs/accessibility/tests.md
index 099fe391098a53..f618a72768e47c 100644
--- a/docs/accessibility/tests.md
+++ b/docs/accessibility/tests.md
@@ -33,7 +33,7 @@ content/shell/test_runner
 To run all accessibility LayoutTests:
 ```
 ninja -C out/release blink_tests
-third_party/WebKit/Tools/Scripts/run-webkit-tests --build-directory=out --target=release accessibility/
+third_party/blink/tools/run_web_tests.py --build-directory=out --target=release accessibility/
 ```
 
 To run just one test by itself without the script:
diff --git a/docs/testing/identifying_tests_that_depend_on_order.md b/docs/testing/identifying_tests_that_depend_on_order.md
index 62251671ab864d..ac2d8147e1c45e 100644
--- a/docs/testing/identifying_tests_that_depend_on_order.md
+++ b/docs/testing/identifying_tests_that_depend_on_order.md
@@ -39,13 +39,13 @@ interested in adding that feature to the script.
 Instead of running `bisect_web_test_ordering.py`, you can manually do the work
 of step 4 above.
 
-1. `run-webkit-tests --child-processes=1 --order=none --test-list=path/to/file/from/step/3`
+1. `run_web_tests.py --child-processes=1 --order=none --test-list=path/to/file/from/step/3`
 2. If the test doesn't fail here, then the test itself is probably just flaky.
    If it does, remove some lines from the file and repeat step 1. Continue
    repeating until you've found the dependency. If the test fails when run by
    itself, but passes on the bots, that means that it depends on another test to
    pass. In this case, you need to generate the list of tests run by
-   `run-webkit-tests --order=natural` and repeat this process to find which test
+   `run_web_tests.py --order=natural` and repeat this process to find which test
    causes the test in question to *pass* (e.g.
    [crbug.com/262793](https://crbug.com/262793)).
 3. File a bug and give it the
@@ -57,13 +57,13 @@ of step 4 above.
 
 #### Run tests in a random order and diagnose failures
 
-1. Run `run-webkit-tests --order=random --no-retry`
+1. Run `run_web_tests.py --order=random --no-retry`
 2. Run `./tools/print_web_test_ordering.py` and save the output to a file. This
    outputs the tests run in the order they were run on each content_shell
    instance.
 3. Run the diagnosing steps from above to figure out which tests
 
-Run `run-webkit-tests --run-singly --no-retry`. This starts up a new
+Run `run_web_tests.py --run-singly --no-retry`. This starts up a new
 content_shell instance for each test. Tests that fail when run in isolation but
 pass when run as part of the full test suite represent some state that we're not
 properly resetting between test runs or some state that we're not properly
diff --git a/docs/testing/layout_test_baseline_fallback.md b/docs/testing/layout_test_baseline_fallback.md
index 3c5ca3d8926855..ee2a8b6559a6f7 100644
--- a/docs/testing/layout_test_baseline_fallback.md
+++ b/docs/testing/layout_test_baseline_fallback.md
@@ -118,7 +118,7 @@ results).
 In addition, the optimizer also removes redundant all-PASS testharness.js
 results. Such baselines are redundant when there are no other fallbacks later
 on the search path (including if the all-PASS baselines are at root), because
-`run-webkit-tests` assumes all-PASS testharness.js results when baselines can
+`run_web_tests.py` assumes all-PASS testharness.js results when baselines can
 not be found for a platform.
 
 ### Rebaseline
diff --git a/docs/testing/layout_tests.md b/docs/testing/layout_tests.md
index f063a86cbff7ca..1673d3b4d62525 100644
--- a/docs/testing/layout_tests.md
+++ b/docs/testing/layout_tests.md
@@ -9,6 +9,10 @@ This document covers running and debugging existing layout tests. See the
 [Writing Layout Tests documentation](./writing_layout_tests.md) if you find
 yourself writing layout tests.
 
+Note that we're in process of changing the term "layout tests" to "web tests".
+Please assume these terms mean the identical stuff. We also call it as
+"WebKit tests" and "WebKit layout tests".
+
 [TOC]
 
 ## Running Layout Tests
@@ -46,20 +50,20 @@ strip ./xcodebuild/{Debug,Release}/content_shell.app/Contents/MacOS/content_shel
 TODO: mention `testing/xvfb.py`
 
 The test runner script is in
-`third_party/WebKit/Tools/Scripts/run-webkit-tests`.
+`third_party/blink/tools/run_web_tests.py`.
 
 To specify which build directory to use (e.g. out/Default, out/Release,
 out/Debug) you should pass the `-t` or `--target` parameter. For example, to
 use the build in `out/Default`, use:
 
 ```bash
-python third_party/WebKit/Tools/Scripts/run-webkit-tests -t Default
+python third_party/blink/tools/run_web_tests.py -t Default
 ```
 
 For Android (if your build directory is `out/android`):
 
 ```bash
-python third_party/WebKit/Tools/Scripts/run-webkit-tests -t android --android
+python third_party/blink/tools/run_web_tests.py -t android --android
 ```
 
 Tests marked as `[ Skip ]` in
@@ -86,13 +90,13 @@ arguments to `run_webkit_tests.py` relative to the layout test directory
 use:
 
 ```bash
-Tools/Scripts/run-webkit-tests fast/forms
+third_party/blink/tools/run_web_tests.py fast/forms
 ```
 
 Or you could use the following shorthand:
 
 ```bash
-Tools/Scripts/run-webkit-tests fast/fo\*
+third_party/blink/tools/run_web_tests.py fast/fo\*
 ```
 
 *** promo
@@ -100,7 +104,7 @@ Example: To run the layout tests with a debug build of `content_shell`, but only
 test the SVG tests and run pixel tests, you would run:
 
 ```bash
-Tools/Scripts/run-webkit-tests -t Default svg
+third_party/blink/tools/run_web_tests.py -t Default svg
 ```
 ***
 
@@ -121,7 +125,7 @@ out/Default/content_shell.exe --run-layout-test --no-sandbox \
 but this requires a manual diff against expected results, because the shell
 doesn't do it for you.
 
-To see a complete list of arguments supported, run: `run-webkit-tests --help`
+To see a complete list of arguments supported, run: `run_web_tests.py --help`
 
 *** note
 **Linux Note:** We try to match the Windows render tree output exactly by
@@ -195,7 +199,7 @@ There are two ways to run layout tests with additional command-line arguments:
 * Using `--additional-driver-flag`:
 
   ```bash
-  run-webkit-tests --additional-driver-flag=--blocking-repaint
+  run_web_tests.py --additional-driver-flag=--blocking-repaint
   ```
 
   This tells the test harness to pass `--blocking-repaint` to the
@@ -405,7 +409,7 @@ machine?
   > Debug DevTools lets you avoid having to recompile after every change to the DevTools front-end.
 * Do one of the following:
     * Option A) Run from the chromium/src folder:
-      `blink/tools/run_layout_tests.sh
+      `third_party/blink/tools/run_web_tests.sh
       --additional-driver-flag='--debug-devtools'
       --additional-driver-flag='--remote-debugging-port=9222'
       --time-out-ms=6000000`
@@ -449,7 +453,7 @@ this:
 gclient sync || exit 125
 ninja -C out/Debug -j100 blink_tests || exit 125
 
-blink/tools/run_layout_tests.sh -t Debug \
+third_party/blink/tools/run_web_tests.py -t Debug \
   --no-show-results --no-retry-failures \
   path/to/layout/test.html
 ```
@@ -474,8 +478,8 @@ read on.
 ***
 
 ```bash
-cd src/third_party/WebKit
-Tools/Scripts/run-webkit-tests --reset-results foo/bar/test.html
+cd src/third_party/blink
+tools/run_web_tests.py --reset-results foo/bar/test.html
 ```
 
 If there are current expectation files for `LayoutTests/foo/bar/test.html`,
@@ -498,8 +502,8 @@ Though we prefer the Rebaseline Tool to local rebaselining, the Rebaseline Tool
 doesn't support rebaselining flag-specific expectations.
 
 ```bash
-cd src/third_party/WebKit
-Tools/Scripts/run-webkit-tests --additional-driver-flag=--enable-flag --reset-results foo/bar/test.html
+cd src/third_party/blink
+tools/run_web_tests.py --additional-driver-flag=--enable-flag --reset-results foo/bar/test.html
 ```
 
 New baselines will be created in the flag-specific baselines directory, e.g.
@@ -513,14 +517,14 @@ files. You can follow the steps below for easier review.
 1. Copy existing baselines to the flag-specific baselines directory for the
    tests to be rebaselined:
    ```bash
-   Tools/Scripts/run-webkit-tests --additional-driver-flag=--enable-flag --copy-baselines foo/bar/test.html
+   third_party/blink/tools/run_web_tests.py --additional-driver-flag=--enable-flag --copy-baselines foo/bar/test.html
    ```
    Then add the newly created baseline files, commit and upload the patch.
    Note that the above command won't copy baselines for passing tests.
 
 2. Rebaseline the test locally:
    ```bash
-   Tools/Scripts/run-webkit-tests --additional-driver-flag=--enable-flag --reset-results foo/bar/test.html
+   third_party/blink/tools/run_web_tests.py --additional-driver-flag=--enable-flag --reset-results foo/bar/test.html
    ```
    Commit the changes and upload the patch.
 
diff --git a/docs/testing/layout_tests_in_content_shell.md b/docs/testing/layout_tests_in_content_shell.md
index 82cb51e465ae4f..25ac0a75b98440 100644
--- a/docs/testing/layout_tests_in_content_shell.md
+++ b/docs/testing/layout_tests_in_content_shell.md
@@ -17,11 +17,11 @@ binaries required to run the tests.
 
 ### Running
 
-You can run layout tests using `run-webkit-tests` (in
-`src/third_party/WebKit/Tools/Scripts`).
+You can run layout tests using `run_web_tests.py` (in
+`src/third_party/blink/tools`).
 
 ```bash
-third_party/WebKit/Tools/Scripts/run-webkit-tests storage/indexeddb
+third_party/blink/tools/run_web_tests.py storage/indexeddb
 ```
 
 or execute the shell directly:
diff --git a/docs/testing/layout_tests_tips.md b/docs/testing/layout_tests_tips.md
index cd50bcc60e603f..5911cc3cfc51d1 100644
--- a/docs/testing/layout_tests_tips.md
+++ b/docs/testing/layout_tests_tips.md
@@ -77,7 +77,7 @@ assess its flakiness. While not foolproof, this approach gives you some
 confidence, and giving up CPU cycles for mental energy is a pretty good trade.
 
 ```bash
-third_party/WebKit/Tools/Scripts/run-webkit-tests path/to/test.html --repeat-each=100
+third_party/blink/tools/run_web_tests.py path/to/test.html --repeat-each=100
 ```
 
 The
diff --git a/docs/testing/web_platform_tests.md b/docs/testing/web_platform_tests.md
index 785c4c19c49953..8e81ba818eb2f2 100644
--- a/docs/testing/web_platform_tests.md
+++ b/docs/testing/web_platform_tests.md
@@ -245,7 +245,7 @@ http://web-platform-tests.org/appendix/github-intro.html.
 ## Running tests
 
 Same as Blink layout tests, you can use
-[`run-webkit-tests`](layout_tests.md#running-the-tests) to run any WPT test.
+[`run_web_tests.py`](layout_tests.md#running-the-tests) to run any WPT test.
 
 One thing to note is that glob patterns for WPT tests are not yet supported.
 
diff --git a/docs/testing/writing_layout_tests.md b/docs/testing/writing_layout_tests.md
index 18d58e8bdcde10..80b2a53170bc89 100644
--- a/docs/testing/writing_layout_tests.md
+++ b/docs/testing/writing_layout_tests.md
@@ -271,7 +271,7 @@ In these situations, a test file will be accompanied by a baseline, which is an
 `-expected.txt` file that contains the test's expected output.
 
 The baselines are generated automatically when appropriate by
-`run-webkit-tests`, which is described [here](./layout_tests.md), and by the
+`run_web_tests.py`, which is described [here](./layout_tests.md), and by the
 [rebaselining tools](./layout_test_expectations.md).
 
 Text baselines for `testharness.js` should be avoided, as having a text baseline
@@ -315,7 +315,7 @@ or features restricted to secure protocols.
 HTTP tests are those under `LayoutTests/http/tests` (or virtual variants). Use a
 locally running HTTP server (Apache) to run them. Tests are served off of ports
 8000 and 8080 for HTTP, and 8443 for HTTPS. If you run the tests using
-`run-webkit-tests`, the server will be started automatically. To run the server
+`run_web_tests.py`, the server will be started automatically. To run the server
 manually to reproduce or debug a failure:
 
 ```bash
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index 80d3fd6b6366a9..190744fc0c181a 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -1314,7 +1314,7 @@
     "script": "//testing/scripts/run_isolated_script_test.py",
     "args": [
       "--xvfb",
-      "../../third_party/WebKit/Tools/Scripts/run-webkit-tests",
+      "../../third_party/blink/tools/run_web_tests.py",
       "--clobber-old-results",
       "--debug-rwt-logging",
       "--no-show-results",
@@ -1327,7 +1327,7 @@
     "script": "//testing/scripts/run_isolated_script_test.py",
     "args": [
       "--xvfb",
-      "../../third_party/WebKit/Tools/Scripts/run-webkit-tests",
+      "../../third_party/blink/tools/run_web_tests.py",
       "--seed", "4",
       "--no-show-results",
       "--clobber-old-results",
diff --git a/testing/scripts/common.py b/testing/scripts/common.py
index e68537f3e5d324..15d3082f88c018 100644
--- a/testing/scripts/common.py
+++ b/testing/scripts/common.py
@@ -19,7 +19,7 @@
     os.path.join(SCRIPT_DIR, os.path.pardir, os.path.pardir))
 
 
-# run-webkit-tests returns the number of failures as the return
+# run_web_tests.py returns the number of failures as the return
 # code, but caps the return code at 101 to avoid overflow or colliding
 # with reserved values from the shell.
 MAX_FAILURES_EXIT_STATUS = 101
diff --git a/third_party/WebKit/LayoutTests/FlagExpectations/README.txt b/third_party/WebKit/LayoutTests/FlagExpectations/README.txt
index d414bd55996c85..e05fd8ccc490ec 100644
--- a/third_party/WebKit/LayoutTests/FlagExpectations/README.txt
+++ b/third_party/WebKit/LayoutTests/FlagExpectations/README.txt
@@ -1,9 +1,9 @@
 FlagExpectations stores flag-specific test expectations.  To run layout tests
 with a flag, use:
 
-  run-webkit-tests --additional-driver-flag=--name-of-flag
+  run_web_tests.py --additional-driver-flag=--name-of-flag
 
-In addition to passing --name-of-flag to the binary, run-webkit-tests will look
+In addition to passing --name-of-flag to the binary, run_web_tests.py will look
 for test expectations in
 
   FlagExpectations/name-of-flag
diff --git a/third_party/WebKit/LayoutTests/FlagExpectations/disable-blink-features=RootLayerScrolling b/third_party/WebKit/LayoutTests/FlagExpectations/disable-blink-features=RootLayerScrolling
index b9ee1f12033d9f..985cdf6ae52a0e 100644
--- a/third_party/WebKit/LayoutTests/FlagExpectations/disable-blink-features=RootLayerScrolling
+++ b/third_party/WebKit/LayoutTests/FlagExpectations/disable-blink-features=RootLayerScrolling
@@ -587,7 +587,7 @@ crbug.com/538697 [ Win ] printing/webgl-oversized-printing.html [ Failure Crash
 # development, just marking failed tests here is fine enough for tests under
 # virtual/outofblink-cors.
 #
-# ./Tools/Scripts/run-webkit-tests virtual/outofblink-cors
+# ./Tools/Scripts/run_web_tests.py virtual/outofblink-cors
 # Found 2061 tests; running 2060, skipping 1.
 # 2060 tests ran as expected (1968 passed, 92 didn't).
 
diff --git a/third_party/WebKit/LayoutTests/NeverFixTests b/third_party/WebKit/LayoutTests/NeverFixTests
index 9ef145b04c1c0d..18d64c47dac2e4 100644
--- a/third_party/WebKit/LayoutTests/NeverFixTests
+++ b/third_party/WebKit/LayoutTests/NeverFixTests
@@ -1,6 +1,6 @@
 # This file should only include tests that we never want to run.
 # There should only be the following categories of tests here:
-#   1. Tests of the test harness (run-webkit-tests) itself.
+#   1. Tests of the test harness (run_web_tests.py) itself.
 #   2. Tests enabled by chromium embedders (e.g. Opera).
 #   3. Tests that apply to some platforms but not others.
 #   4. Tests that are too slow in Debug and so we only want to skip them in Debug.
@@ -1829,7 +1829,7 @@ crbug.com/457718 external/wpt/css/css-pseudo/marker-font-properties.html [ WontF
 external/wpt/mediacapture-streams/MediaStream-default-feature-policy.https.html [ WontFix ]
 
 # These directories have manual tests that don't have to run with
-# run-webkit-tests; see https://crbug.com/359838.
+# run_web_tests.py; see https://crbug.com/359838.
 http/tests/ManualTests/ [ WontFix ]
 
 # These test produce invisible different pixels on Win7 Debug.
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index e44b468b44edb7..e62a7e2ab25717 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1222,7 +1222,7 @@ crbug.com/826878 [ Mac ] virtual/color_space/fast/canvas/color-space/toDataURL-c
 # development, just marking failed tests here is fine enough for tests under
 # virtual/outofblink-cors.
 #
-# ./Tools/Scripts/run-webkit-tests virtual/outofblink-cors
+# ./thrid_party/blink/tools/run_web_tests.py virtual/outofblink-cors
 # Found 2061 tests; running 2060, skipping 1.
 # 2060 tests ran as expected (1968 passed, 92 didn't).
 
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/file-input-files-access.html b/third_party/WebKit/LayoutTests/editing/pasteboard/file-input-files-access.html
index 3f9e1952d7c2b6..01338ef794a294 100644
--- a/third_party/WebKit/LayoutTests/editing/pasteboard/file-input-files-access.html
+++ b/third_party/WebKit/LayoutTests/editing/pasteboard/file-input-files-access.html
@@ -125,7 +125,7 @@
 if (window.eventSender) {
     runTest();
 } else {
-    testFailed("This test is not interactive, please run using run-webkit-tests");
+    testFailed("This test is not interactive, please run using run_web_tests.py");
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/events/message-channel-listener-circular-ownership-expected.txt b/third_party/WebKit/LayoutTests/fast/events/message-channel-listener-circular-ownership-expected.txt
index c9e7a1a5283813..c136f9fb16ef7f 100644
--- a/third_party/WebKit/LayoutTests/fast/events/message-channel-listener-circular-ownership-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/events/message-channel-listener-circular-ownership-expected.txt
@@ -1,5 +1,5 @@
 Test that a leak is not created by assigning a MessagePort to a property of its own listener.
 
-Only works with run-webkit-tests --leaks.
+Only works with run_web_tests.py --leaks.
 
 
diff --git a/third_party/WebKit/LayoutTests/fast/events/message-channel-listener-circular-ownership.html b/third_party/WebKit/LayoutTests/fast/events/message-channel-listener-circular-ownership.html
index 637d4c220315c2..76eca35c2121c2 100644
--- a/third_party/WebKit/LayoutTests/fast/events/message-channel-listener-circular-ownership.html
+++ b/third_party/WebKit/LayoutTests/fast/events/message-channel-listener-circular-ownership.html
@@ -1,6 +1,6 @@
 <body>
 <p>Test that a leak is not created by assigning a MessagePort to a property of its own listener.</p>
-<p>Only works with run-webkit-tests --leaks.</p>
+<p>Only works with run_web_tests.py --leaks.</p>
 <pre id=log></pre>
 <script src="../../resources/gc.js"></script>
 <script>
diff --git a/third_party/WebKit/LayoutTests/fast/events/select-element-expected.txt b/third_party/WebKit/LayoutTests/fast/events/select-element-expected.txt
index 229cd524568e3d..32933e48964314 100644
--- a/third_party/WebKit/LayoutTests/fast/events/select-element-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/events/select-element-expected.txt
@@ -1,4 +1,4 @@
-This test verifies that the Home/End/PageUp/PageDown keys work correctly for <select> elements. Since it requires eventSender.keyDown, it will not run solo in the web browser; it must be run with run-webkit-tests.
+This test verifies that the Home/End/PageUp/PageDown keys work correctly for <select> elements. Since it requires eventSender.keyDown, it will not run solo in the web browser; it must be run with run_web_tests.py.
 
     
 PASS sendKeyAndExpectIndex("ss", "PageDown", 0, 3) is true
diff --git a/third_party/WebKit/LayoutTests/fast/events/select-element.html b/third_party/WebKit/LayoutTests/fast/events/select-element.html
index 45aa9ae5669b67..f326b45288fece 100644
--- a/third_party/WebKit/LayoutTests/fast/events/select-element.html
+++ b/third_party/WebKit/LayoutTests/fast/events/select-element.html
@@ -4,7 +4,7 @@
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <body>
 <p>This test verifies that the Home/End/PageUp/PageDown keys work correctly for &lt;select&gt; elements.
-Since it requires <CODE>eventSender.keyDown</CODE>, it will not run solo in the web browser; it must be run with <KBD>run-webkit-tests</KBD>.</p>
+Since it requires <CODE>eventSender.keyDown</CODE>, it will not run solo in the web browser; it must be run with <KBD>run_web_tests.py</KBD>.</p>
 <hr>
 <form>
     <select name="singleselect" id="ss" size="4" multiple="true">
diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-clipped-hit.svg b/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-clipped-hit.svg
index f0f9077769708c..d840a90ce39bc6 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-clipped-hit.svg
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-clipped-hit.svg
@@ -33,7 +33,7 @@
                 document.getElementById("status").textContent = "Passed";
          } else {
             // in manual mode
-            alert("Please use run-webkit-tests.");
+            alert("Please use run_web_tests.py.");
         }
      }
    ]]></script>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-all.svg b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-all.svg
index 175cec2730f892..a3de14cb820374 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-all.svg
+++ b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-all.svg
@@ -24,7 +24,7 @@ function clickLinkNow() {
         eventSender.mouseUp();
     } else {
         // in manual mode
-        alert("Please use run-webkit-tests.");
+        alert("Please use run_web_tests.py.");
     }
 }
 ]]>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-preserveAspectRatio.svg b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-preserveAspectRatio.svg
index 0b1150466cb560..6f6514682ee6a5 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-preserveAspectRatio.svg
+++ b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-preserveAspectRatio.svg
@@ -24,7 +24,7 @@ function clickLinkNow() {
         eventSender.mouseUp();
     } else {
         // in manual mode
-        alert("Please use run-webkit-tests.");
+        alert("Please use run_web_tests.py.");
     }
 }
 ]]>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-transform.svg b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-transform.svg
index f475cf320f71b0..400fdfe2e8e814 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-transform.svg
+++ b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-transform.svg
@@ -24,7 +24,7 @@ function clickLinkNow() {
         eventSender.mouseUp();
     } else {
         // in manual mode
-        alert("Please use run-webkit-tests.");
+        alert("Please use run_web_tests.py.");
     }
 }
 ]]>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewBox-transform.svg b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewBox-transform.svg
index 3247747edb71c5..0ea964809ddf9b 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewBox-transform.svg
+++ b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewBox-transform.svg
@@ -24,7 +24,7 @@ function clickLinkNow() {
         eventSender.mouseUp();
     } else {
         // in manual mode
-        alert("Please use run-webkit-tests.");
+        alert("Please use run_web_tests.py.");
     }
 }
 ]]>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewBox.svg b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewBox.svg
index 34c7ab8067334f..df0201d5efe358 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewBox.svg
+++ b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewBox.svg
@@ -24,7 +24,7 @@ function clickLinkNow() {
         eventSender.mouseUp();
     } else {
         // in manual mode
-        alert("Please use run-webkit-tests.");
+        alert("Please use run_web_tests.py.");
     }
 }
 ]]>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewTarget.svg b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewTarget.svg
index fb38e9d460693c..a09bc18e9cab56 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewTarget.svg
+++ b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-viewTarget.svg
@@ -24,7 +24,7 @@ function clickLinkNow() {
         eventSender.mouseUp();
     } else {
         // in manual mode
-        alert("Please use run-webkit-tests.");
+        alert("Please use run_web_tests.py.");
     }
 }
 ]]>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-zoomAndPan.svg b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-zoomAndPan.svg
index 037514e4e2594f..9feab30bce64fd 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-zoomAndPan.svg
+++ b/third_party/WebKit/LayoutTests/svg/custom/linking-a-03-b-zoomAndPan.svg
@@ -24,7 +24,7 @@ function clickLinkNow() {
         eventSender.mouseUp();
     } else {
         // in manual mode
-        alert("Please use run-webkit-tests.");
+        alert("Please use run_web_tests.py.");
     }
 }
 ]]>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/linking-uri-01-b.svg b/third_party/WebKit/LayoutTests/svg/custom/linking-uri-01-b.svg
index e83a9e79f01979..1189b2f6d5c807 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/linking-uri-01-b.svg
+++ b/third_party/WebKit/LayoutTests/svg/custom/linking-uri-01-b.svg
@@ -27,7 +27,7 @@ function clickLink() {
         eventSender.mouseUp();
     } else {
         // in manual mode
-        alert("Please use run-webkit-tests.");
+        alert("Please use run_web_tests.py.");
     }
 }
 ]]>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/pan-direction.svg b/third_party/WebKit/LayoutTests/svg/custom/pan-direction.svg
index fc0bd48b22ecd9..aec5a6cf1ffad7 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/pan-direction.svg
+++ b/third_party/WebKit/LayoutTests/svg/custom/pan-direction.svg
@@ -13,7 +13,7 @@
             testPanUp(30);
          } else {
             // in manual mode
-            alert("Please use run-webkit-tests.");
+            alert("Please use run_web_tests.py.");
          }
      }
    ]]></script>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/text-hit-test.svg b/third_party/WebKit/LayoutTests/svg/custom/text-hit-test.svg
index 23824178380fd8..b610af163aca0f 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/text-hit-test.svg
+++ b/third_party/WebKit/LayoutTests/svg/custom/text-hit-test.svg
@@ -32,7 +32,7 @@
                 document.getElementById("status").textContent = "Passed";
          } else {
             // in manual mode
-            alert("Please use run-webkit-tests.");
+            alert("Please use run_web_tests.py.");
         }
      }
    ]]></script>
diff --git a/third_party/WebKit/LayoutTests/transitions/transition-end-event-helpers.js b/third_party/WebKit/LayoutTests/transitions/transition-end-event-helpers.js
index 079914cbad9682..bc3caed39bed6f 100644
--- a/third_party/WebKit/LayoutTests/transitions/transition-end-event-helpers.js
+++ b/third_party/WebKit/LayoutTests/transitions/transition-end-event-helpers.js
@@ -156,7 +156,7 @@ function runTransitionTest(expected, callback)
     }
 
     _endFunction = function() { processEndEvents(expected); };
-    // Add three seconds of fudge. We don't just use the run-webkit-tests timeout
+    // Add three seconds of fudge. We don't just use the run_web_tests.py timeout
     // because processEndEvents gives more information on what failed.
     window.setTimeout(_endFunction, maxTime * 1000 + 3000);
   }
diff --git a/third_party/WebKit/LayoutTests/webaudio/AudioParam/value-setter-warnings-expected.txt b/third_party/WebKit/LayoutTests/webaudio/AudioParam/value-setter-warnings-expected.txt
index 123fb548399624..e432964efe97d8 100644
--- a/third_party/WebKit/LayoutTests/webaudio/AudioParam/value-setter-warnings-expected.txt
+++ b/third_party/WebKit/LayoutTests/webaudio/AudioParam/value-setter-warnings-expected.txt
@@ -1,4 +1,4 @@
-CONSOLE ERROR: line 39: [audit.js] this test requires the explicit comparison with the expected result when it runs with run-webkit-tests.
+CONSOLE ERROR: line 39: [audit.js] this test requires the explicit comparison with the expected result when it runs with run_web_tests.py.
 CONSOLE MESSAGE: line 129: Test: test-0
 CONSOLE MESSAGE: line 129: Test: test-1
 CONSOLE MESSAGE: line 129: Test: test-2
diff --git a/third_party/WebKit/LayoutTests/webaudio/IIRFilter/iir-unstable-expected.txt b/third_party/WebKit/LayoutTests/webaudio/IIRFilter/iir-unstable-expected.txt
index d2c3824836deb8..bce77f7aa836e0 100644
--- a/third_party/WebKit/LayoutTests/webaudio/IIRFilter/iir-unstable-expected.txt
+++ b/third_party/WebKit/LayoutTests/webaudio/IIRFilter/iir-unstable-expected.txt
@@ -1,4 +1,4 @@
-CONSOLE ERROR: line 39: [audit.js] this test requires the explicit comparison with the expected result when it runs with run-webkit-tests.
+CONSOLE ERROR: line 39: [audit.js] this test requires the explicit comparison with the expected result when it runs with run_web_tests.py.
 CONSOLE WARNING: line 20: Unstable IIRFilter with feedback coefficients: [1, 1.1]
 This is a testharness.js-based test.
 PASS # AUDIT TASK RUNNER STARTED.
diff --git a/third_party/WebKit/LayoutTests/webaudio/resources/audit.js b/third_party/WebKit/LayoutTests/webaudio/resources/audit.js
index 76ebc436558ae8..66c9b2be691cc2 100644
--- a/third_party/WebKit/LayoutTests/webaudio/resources/audit.js
+++ b/third_party/WebKit/LayoutTests/webaudio/resources/audit.js
@@ -1309,7 +1309,7 @@ window.Audit = (function() {
       xhr.responseType = 'arraybuffer';
 
       xhr.onload = () => {
-        // |status = 0| is a workaround for the run-webkit-test server. We are
+        // |status = 0| is a workaround for the run_web_test.py server. We are
         // speculating the server quits the transaction prematurely without
         // completing the request.
         if (xhr.status === 200 || xhr.status === 0) {
@@ -1365,7 +1365,7 @@ window.Audit = (function() {
       if (options && options.requireResultFile == true) {
         _logError(
             'this test requires the explicit comparison with the ' +
-            'expected result when it runs with run-webkit-tests.');
+            'expected result when it runs with run_web_tests.py.');
       }
 
       return new TaskRunner();
diff --git a/third_party/WebKit/LayoutTests/webaudio/tools/README.md b/third_party/WebKit/LayoutTests/webaudio/tools/README.md
index 0c3baa60963056..ac06092616973c 100644
--- a/third_party/WebKit/LayoutTests/webaudio/tools/README.md
+++ b/third_party/WebKit/LayoutTests/webaudio/tools/README.md
@@ -19,7 +19,7 @@ or notes and print out the logs at the end of the processing.
 
 ## Installation
 
-The `run-webkit-tests` script process all the files in the `webaudio/` directory, so files created by the node package installation will pollute the test result. To avoid this, copy `tools/` directory to another directory. Then run the following in that directory.
+The `run_web_tests.py` script process all the files in the `webaudio/` directory, so files created by the node package installation will pollute the test result. To avoid this, copy `tools/` directory to another directory. Then run the following in that directory.
 
 ```
 cd ${WHERE_PACKAGE_JSON_IS} npm install
diff --git a/third_party/WebKit/LayoutTests/webaudio/unit-tests/audit-expected.txt b/third_party/WebKit/LayoutTests/webaudio/unit-tests/audit-expected.txt
index 6fcee2ffc57a0e..5782809a152e4c 100644
--- a/third_party/WebKit/LayoutTests/webaudio/unit-tests/audit-expected.txt
+++ b/third_party/WebKit/LayoutTests/webaudio/unit-tests/audit-expected.txt
@@ -1,4 +1,4 @@
-CONSOLE ERROR: line 39: [audit.js] this test requires the explicit comparison with the expected result when it runs with run-webkit-tests.
+CONSOLE ERROR: line 39: [audit.js] this test requires the explicit comparison with the expected result when it runs with run_web_tests.py.
 This is a testharness.js-based test.
 Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "  1 is equal to 1."
 PASS # AUDIT TASK RUNNER STARTED.
diff --git a/third_party/WebKit/LayoutTests/webaudio/unit-tests/audit-failures-expected.txt b/third_party/WebKit/LayoutTests/webaudio/unit-tests/audit-failures-expected.txt
index 3280ebf70b5fef..87b2bf0c93bc99 100644
--- a/third_party/WebKit/LayoutTests/webaudio/unit-tests/audit-failures-expected.txt
+++ b/third_party/WebKit/LayoutTests/webaudio/unit-tests/audit-failures-expected.txt
@@ -1,4 +1,4 @@
-CONSOLE ERROR: line 39: [audit.js] this test requires the explicit comparison with the expected result when it runs with run-webkit-tests.
+CONSOLE ERROR: line 39: [audit.js] this test requires the explicit comparison with the expected result when it runs with run_web_tests.py.
 This is a testharness.js-based test.
 PASS # AUDIT TASK RUNNER STARTED.
 PASS > [basic-failure] Testing basic assertion failures.
diff --git a/third_party/WebKit/Tools/Scripts/run-webkit-tests b/third_party/WebKit/Tools/Scripts/run-webkit-tests
index 9e10288c1f94f7..7da86061513b93 100755
--- a/third_party/WebKit/Tools/Scripts/run-webkit-tests
+++ b/third_party/WebKit/Tools/Scripts/run-webkit-tests
@@ -32,4 +32,5 @@
 from webkitpy.common import add_blinkpy  # pylint: disable=unused-import
 from blinkpy.common import multiprocessing_bootstrap
 
+print '\n    Please use third_party/blink/tools/run_web_tests.*.  This command will be removed.\n'
 multiprocessing_bootstrap.run('blinkpy', 'web_tests', 'run_webkit_tests.py')
diff --git a/third_party/blink/tools/blinkpy/common/exit_codes.py b/third_party/blink/tools/blinkpy/common/exit_codes.py
index 2e8ab8820c9b61..0e01408e94501c 100644
--- a/third_party/blink/tools/blinkpy/common/exit_codes.py
+++ b/third_party/blink/tools/blinkpy/common/exit_codes.py
@@ -10,7 +10,7 @@
 # signal). (unsigned)(-SIGINT) == 128+signal.SIGINT
 INTERRUPTED_EXIT_STATUS = signal.SIGINT + 128
 
-# POSIX limits status codes to 0-255. Normally run-webkit-tests returns the
+# POSIX limits status codes to 0-255. Normally run_web_tests.py returns the
 # number of tests that failed. These indicate exceptional conditions triggered
 # by the script itself, so we count backwards from 255 (aka -1) to enumerate
 # them.
diff --git a/third_party/blink/tools/blinkpy/common/message_pool.py b/third_party/blink/tools/blinkpy/common/message_pool.py
index eb41364f40fab4..15ba177b7f90cf 100644
--- a/third_party/blink/tools/blinkpy/common/message_pool.py
+++ b/third_party/blink/tools/blinkpy/common/message_pool.py
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-"""Module for handling messages and concurrency for run-webkit-tests
+"""Module for handling messages and concurrency for run_we_tests.py
 and run_blinkpy_tests.py. This module follows the design for
 multiprocessing.Pool and concurrency.futures.ProcessPoolExecutor, with the
 following differences:
diff --git a/third_party/blink/tools/blinkpy/style/checkers/png.py b/third_party/blink/tools/blinkpy/style/checkers/png.py
index 4260d4b77e7375..d0c12cab97ef15 100644
--- a/third_party/blink/tools/blinkpy/style/checkers/png.py
+++ b/third_party/blink/tools/blinkpy/style/checkers/png.py
@@ -43,4 +43,4 @@ def check(self, inline=None):
                 if not read_checksum_from_png.read_checksum(filehandle):
                     self._handle_style_error(
                         0, 'image/png', 5,
-                        'Image lacks a checksum. Generate pngs using run-webkit-tests to ensure they have a checksum.')
+                        'Image lacks a checksum. Generate pngs using run_web_tests.py to ensure they have a checksum.')
diff --git a/third_party/blink/tools/blinkpy/style/checkers/png_unittest.py b/third_party/blink/tools/blinkpy/style/checkers/png_unittest.py
index 805e813cdbf85f..99b56a40038de2 100644
--- a/third_party/blink/tools/blinkpy/style/checkers/png_unittest.py
+++ b/third_party/blink/tools/blinkpy/style/checkers/png_unittest.py
@@ -67,4 +67,4 @@ def mock_handle_style_error(line_number, category, confidence, message):
         self.assertEqual(len(errors), 1)
         self.assertEqual(
             errors[0],
-            (0, 'image/png', 5, 'Image lacks a checksum. Generate pngs using run-webkit-tests to ensure they have a checksum.'))
+            (0, 'image/png', 5, 'Image lacks a checksum. Generate pngs using run_web_tests.py to ensure they have a checksum.'))
diff --git a/third_party/blink/tools/blinkpy/third_party/wpt/README.chromium b/third_party/blink/tools/blinkpy/third_party/wpt/README.chromium
index ebddc3b39a8333..c221b0af09ca48 100644
--- a/third_party/blink/tools/blinkpy/third_party/wpt/README.chromium
+++ b/third_party/blink/tools/blinkpy/third_party/wpt/README.chromium
@@ -131,14 +131,14 @@ https://github.com/w3c/web-platform-tests/blob/master/README.md
 Also, check out the WPTServe Documentation
 (https://wptserve.readthedocs.org/en/latest/).
 
-Note that editing /etc/hosts is not required for run-webkit-tests since
+Note that editing /etc/hosts is not required for run_web_tests.py since
 content_shell is invoked with flags to map all *.test domains to 127.0.0.1.
 
 **
 
 Running web-platform-tests with enabled WPTServe on a local machine
 
-WPTServe is now enabled by default in run-webkit-tests for tests that live in
+WPTServe is now enabled by default in run_web_tests.py for tests that live in
 LayoutTests/external/wpt.
 
 WPTServe starts HTTP/S and WS/S servers as separate processes.
@@ -149,4 +149,4 @@ LayoutTests/external/wpt. HTTPS tests are enabled by default.
 
 Example run:
 
-./Tools/Scripts/run-webkit-tests external/wpt
+./tools/run_web_tests.py external/wpt
diff --git a/third_party/blink/tools/blinkpy/w3c/test_importer.py b/third_party/blink/tools/blinkpy/w3c/test_importer.py
index e4b5398fd98c5b..08f27605a53586 100644
--- a/third_party/blink/tools/blinkpy/w3c/test_importer.py
+++ b/third_party/blink/tools/blinkpy/w3c/test_importer.py
@@ -146,7 +146,7 @@ def main(self, argv=None):
         # self._delete_orphaned_baselines()
 
         # TODO(qyearsley): Consider running the imported tests with
-        # `run-webkit-tests --reset-results external/wpt` to get some baselines
+        # `run_web_tests.py --reset-results external/wpt` to get some baselines
         # before the try jobs are started.
 
         _log.info('Updating TestExpectations for any removed or renamed tests.')
diff --git a/third_party/blink/tools/blinkpy/web_tests/bisect_test_ordering.py b/third_party/blink/tools/blinkpy/web_tests/bisect_test_ordering.py
index 5b478bfdfa120a..ad2258974d33f3 100644
--- a/third_party/blink/tools/blinkpy/web_tests/bisect_test_ordering.py
+++ b/third_party/blink/tools/blinkpy/web_tests/bisect_test_ordering.py
@@ -98,7 +98,7 @@ def print_result(self):
         for bucket in self.buckets:
             tests += bucket.tests
         extra_args = ' --debug' if self.is_debug else ''
-        print 'run-webkit-tests%s --child-processes=1 --order=none %s' % (extra_args, ' '.join(tests))
+        print 'run_web_tests.py%s --child-processes=1 --order=none %s' % (extra_args, ' '.join(tests))
 
     def is_done(self):
         for bucket in self.buckets:
@@ -145,7 +145,7 @@ def test_bucket_list_fails(self, buckets):
 
     def test_fails(self, tests):
         extra_args = ['--debug'] if self.is_debug else []
-        path_to_run_webkit_tests = self.path_finder.path_from_tools_scripts('run-webkit-tests')
+        path_to_run_webkit_tests = self.path_finder.path_from_tools_scripts('run_web_tests.py')
         output = self.executive.popen(
             [path_to_run_webkit_tests, '--child-processes', '1', '--order', 'none', '--no-retry',
              '--no-show-results', '--verbose'] + extra_args + tests, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
diff --git a/third_party/blink/tools/blinkpy/web_tests/controllers/layout_test_finder.py b/third_party/blink/tools/blinkpy/web_tests/controllers/layout_test_finder.py
index afdeb76ee09039..165d2595aa4ce3 100644
--- a/third_party/blink/tools/blinkpy/web_tests/controllers/layout_test_finder.py
+++ b/third_party/blink/tools/blinkpy/web_tests/controllers/layout_test_finder.py
@@ -90,7 +90,7 @@ def _times_trie(self):
     # the css3/flexbox tests. It should *not* run the fastest 50%
     # of the css3/flexbox tests.
     #
-    # run-webkit-tests --fastest=50 css3/flexbox
+    # run_web_tests.py --fastest=50 css3/flexbox
     def _fastest_tests(self, times_trie, all_tests, fastest_percentile):
         times = convert_times_trie_to_flat_paths(times_trie)
 
diff --git a/third_party/blink/tools/blinkpy/web_tests/run_webkit_tests.py b/third_party/blink/tools/blinkpy/web_tests/run_webkit_tests.py
index 32ae1909aa3136..d80c5df83c496a 100644
--- a/third_party/blink/tools/blinkpy/web_tests/run_webkit_tests.py
+++ b/third_party/blink/tools/blinkpy/web_tests/run_webkit_tests.py
@@ -389,7 +389,7 @@ def parse_args(args):
                 default=None,
                 help=('Number of times to retry failures. Default (when this '
                       'flag is not specified) is to retry 3 times, unless an '
-                      'explicit list of tests is passed to run-webkit-tests. '
+                      'explicit list of tests is passed to run_web_tests.py. '
                       'If a non-zero value is given explicitly, failures are '
                       'retried regardless.')),
             optparse.make_option(
@@ -527,7 +527,7 @@ def parse_args(args):
         ]))
 
     option_parser = optparse.OptionParser(
-        prog='run-webkit-tests',
+        prog='run_web_tests.py',
         usage='%prog [options] [tests]',
         description='Runs Blink layout tests as described in docs/testing/layout_tests.md')
 
diff --git a/third_party/blink/tools/blinkpy/web_tests/try_flag.py b/third_party/blink/tools/blinkpy/web_tests/try_flag.py
index aa6d8ddd5c41ff..0c4d216fae5db9 100644
--- a/third_party/blink/tools/blinkpy/web_tests/try_flag.py
+++ b/third_party/blink/tools/blinkpy/web_tests/try_flag.py
@@ -53,7 +53,7 @@ def _force_flag_for_test_runner(self):
         self._filesystem.write_text_file(path, flag + '\n')
         self._git.add_list([path])
         self._git.commit_locally_with_message(
-            'Flag try job: force %s for run-webkit-tests.' % flag)
+            'Flag try job: force %s for run_web_tests.py.' % flag)
 
     def _flag_expectations_path(self):
         return self._path_finder.path_from_layout_tests(
@@ -166,7 +166,7 @@ def parse_args(argv):
     parser.add_argument('action', help='"trigger" or "update"')
     parser.add_argument('--bug', help='crbug number for expectation lines')
     parser.add_argument('--flag', required=True,
-                        help='flag to force-enable in run-webkit-tests')
+                        help='flag to force-enable in run_web_tests.py')
     parser.add_argument('--regenerate', action='store_true',
                         help='clear the flag expectations before triggering')
     return parser.parse_args(argv)
diff --git a/third_party/blink/tools/blinkpy/web_tests/try_flag_unittest.py b/third_party/blink/tools/blinkpy/web_tests/try_flag_unittest.py
index 8532f66f32ea5d..655015e4941425 100644
--- a/third_party/blink/tools/blinkpy/web_tests/try_flag_unittest.py
+++ b/third_party/blink/tools/blinkpy/web_tests/try_flag_unittest.py
@@ -43,7 +43,7 @@ def _run_trigger_test(self, regenerate):
         TryFlag(cmd, host, git_cl).run()
 
         expected_added_paths = {flag_file}
-        expected_commits = [['Flag try job: force --foo for run-webkit-tests.']]
+        expected_commits = [['Flag try job: force --foo for run_web_tests.py.']]
 
         if regenerate:
             expected_added_paths.add(flag_expectations_file)
diff --git a/third_party/blink/tools/blinkpy/web_tests/views/printing.py b/third_party/blink/tools/blinkpy/web_tests/views/printing.py
index 57c8cbf6071439..bab2dd3117fdae 100644
--- a/third_party/blink/tools/blinkpy/web_tests/views/printing.py
+++ b/third_party/blink/tools/blinkpy/web_tests/views/printing.py
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-"""Package that handles non-debug, non-file output for run_webkit_tests."""
+"""Package that handles non-debug, non-file output for run_web_tests.py."""
 
 import math
 import optparse
@@ -42,7 +42,7 @@
 def print_options():
     return [
         optparse.make_option('--debug-rwt-logging', action='store_true', default=False,
-                             help='print timestamps and debug information for run_webkit_tests itself'),
+                             help='print timestamps and debug information for run_web_tests.py itself'),
         optparse.make_option('--details', action='store_true', default=False,
                              help='print detailed results for every test'),
         optparse.make_option('-q', '--quiet', action='store_true', default=False,
@@ -55,7 +55,7 @@ def print_options():
 
 
 class Printer(object):
-    """Class handling all non-debug-logging printing done by run_webkit_tests."""
+    """Class handling all non-debug-logging printing done by run_web_tests.py."""
 
     def __init__(self, port, options, regular_output, logger=None):
         self.num_completed = 0
diff --git a/third_party/blink/tools/blinkruby/PrettyPatch.rb b/third_party/blink/tools/blinkruby/PrettyPatch.rb
index 07e599782e21b9..3345cbf0b509cd 100644
--- a/third_party/blink/tools/blinkruby/PrettyPatch.rb
+++ b/third_party/blink/tools/blinkruby/PrettyPatch.rb
@@ -89,7 +89,7 @@ def self.diff_header?(line)
 
     OPENSOURCE_URL = "https://chromium.googlesource.com/chromium/src/+/master/"
 
-    IMAGE_CHECKSUM_ERROR = "INVALID: Image lacks a checksum. This will fail with a MISSING error in run-webkit-tests. Always generate new png files using run-webkit-tests."
+    IMAGE_CHECKSUM_ERROR = "INVALID: Image lacks a checksum. This will fail with a MISSING error in run_web_tests.py. Always generate new png files using run_web_tests.py."
 
     def self.normalize_line_ending(s)
         if RUBY_VERSION >= "1.9"
diff --git a/third_party/blink/tools/check_testharness_expected_pass.py b/third_party/blink/tools/check_testharness_expected_pass.py
index 27629cbc85f147..83db918c1d9d5e 100755
--- a/third_party/blink/tools/check_testharness_expected_pass.py
+++ b/third_party/blink/tools/check_testharness_expected_pass.py
@@ -7,7 +7,7 @@
 """Check if a LayoutTest expected file is an all-PASS testharness result.
 
 LayoutTests/PRESUBMIT.py uses this script to identify generic all-PASS
-testharness baselines, which are redundant because run-webkit-tests assumes
+testharness baselines, which are redundant because run_web_tests.py assumes
 all-PASS results for testharness tests when baselines are not found.
 """
 
diff --git a/third_party/blink/tools/debug_web_tests b/third_party/blink/tools/debug_web_tests
index f9dea7c2b7d248..eec62551a0a893 100755
--- a/third_party/blink/tools/debug_web_tests
+++ b/third_party/blink/tools/debug_web_tests
@@ -6,7 +6,7 @@
 # Runs run-webkit-tests and attaches a debugger to the single renderer process.
 
 if [ $# -eq 0 ]; then
-  echo "usage: $(basename $0) [run-webkit-tests args...] test-path/test-name.html"
+  echo "usage: $(basename $0) [run_web_tests.py args...] test-path/test-name.html"
   exit 1
 fi
 
@@ -39,7 +39,7 @@ fi
 pkill -f "$RENDERER_REGEX"
 
 # Run with a single child process as this script attaches only to the first renderer.
-$SCRIPTS_DIR/run-webkit-tests --child-processes=1 --time-out-ms=100000000 --additional-driver-flag=--no-sandbox --additional-driver-flag=--renderer-startup-dialog $* &
+$SCRIPTS_DIR/run_web_tests.py --child-processes=1 --time-out-ms=100000000 --additional-driver-flag=--no-sandbox --additional-driver-flag=--renderer-startup-dialog $* &
 
 wait_renderer_pid() {
   for i in {1..200}; do
diff --git a/third_party/blink/tools/run_web_tests.bat b/third_party/blink/tools/run_web_tests.bat
new file mode 100755
index 00000000000000..fb9b540c58f04a
--- /dev/null
+++ b/third_party/blink/tools/run_web_tests.bat
@@ -0,0 +1,6 @@
+@echo off
+:: Copyright 2018 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.
+
+python %~dp0\run_web_tests.py %*
diff --git a/third_party/blink/tools/run_web_tests.py b/third_party/blink/tools/run_web_tests.py
new file mode 100755
index 00000000000000..fdd79ec0eab441
--- /dev/null
+++ b/third_party/blink/tools/run_web_tests.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env vpython
+# Copyright 2018 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.
+
+"""Run web_tests (aka LayoutTests)"""
+
+from blinkpy.common import multiprocessing_bootstrap
+
+multiprocessing_bootstrap.run('blinkpy', 'web_tests', 'run_webkit_tests.py')
diff --git a/tools/bash-completion b/tools/bash-completion
index 5645dffe55680a..05d1d2b2a43b63 100644
--- a/tools/bash-completion
+++ b/tools/bash-completion
@@ -16,9 +16,9 @@
 # $ out/gn/unit_tests --gtest_filt<tab>
 # $ out/gn/unit_tests --test-launcher-j<tab>
 #
-# Layout test switches:
-# $ third_party/WebKit/Tools/Scripts/run-webkit-tests --additional-driver-f<tab>
-# $ .../run-webkit-tests --additional-driver-flag=--site-per-pro<tab>
+# Web test switches:
+# $ third_party/blink/tools/run_web_tests.py --additional-driver-f<tab>
+# $ .../run_web_tests.py --additional-driver-flag=--site-per-pro<tab>
 #
 # Blink blink_tool.py sub-commands:
 # $ third_party/blink/tools/blink_tool.py reb<tab>
@@ -53,8 +53,8 @@ _gtest_flag() {
     return 0
 }
 
-_layout_test_flag() {
-    local cur targets webkitpy_dir prev_switch
+_web_test_flag() {
+    local cur targets blinkpy_dir prev_switch
     cur="${COMP_WORDS[COMP_CWORD]}"
 
     # Complete content_shell switches if appropriate.
@@ -72,16 +72,16 @@ _layout_test_flag() {
       fi
     fi
 
-    # Complete run-webkit-tests switches.
-    webkitpy_dir="$chrome_source/third_party/WebKit/Tools/Scripts/webkitpy"
+    # Complete run_web_tests.py switches.
+    blinkpy_dir="$chrome_source/third_party/blink/tools/blinkpy"
     targets=$(sed -ne 's/^[[:space:]]*"\(--[a-z-]\+\)",[[:space:]]*$/\1/p' \
-        "$webkitpy_dir/layout_tests/run_webkit_tests.py")
+        "$blinkpy_dir/web_tests/run_webkit_tests.py")
     COMPREPLY=($(compgen -W "$targets" -- "$cur"))
     return 0
 }
 
 _blink_tool_flag() {
-    local cur targets webkit_scripts_dir
+    local cur targets blink_tools_dir
     cur="${COMP_WORDS[COMP_CWORD]}"
     blink_tools_dir=$chrome_source/third_party/blink/tools
     targets=$($blink_tools_dir/blink_tool.py help | grep '^   [a-z]' | \
@@ -104,5 +104,5 @@ for gtest_test_executable in $(
   complete -F _gtest_flag $gtest_test_executable
 done
 
-complete -F _layout_test_flag run-webkit-tests
+complete -F _web_test_flag run_web_tests.py
 complete -F _blink_tool_flag blink_tool.py
diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc
index e73bb3f9383df2..c3b4415f16de7d 100644
--- a/tools/imagediff/image_diff.cc
+++ b/tools/imagediff/image_diff.cc
@@ -6,7 +6,7 @@
 // Tools/DumpRenderTree/ImageDiff.m
 
 // The exact format of this tool's output to stdout is important, to match
-// what the run-webkit-tests script expects.
+// what the run_web_tests.py script expects.
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 321a182176b17e..b85833b8ea4fb0 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -523,7 +523,7 @@
       # 'release_trybot' includes 'dcheck_always_on', and the blink
       # release trybots must *not* enable dchecks, because that could
       # cause them to produce different baselines than the release
-      # waterfall bots, and run-webkit-tests can't handle that (by design).
+      # waterfall bots, and run_web_tests.py can't handle that (by design).
       'linux_trusty_blink_compile_dbg': 'debug_trybot',
       'linux_trusty_blink_compile_rel': 'release_bot_minimal_symbols',
       'linux_trusty_blink_dbg': 'debug_trybot',