Replace --run-layout-test with --run-web-tests in LayoutTests/.

Bug: 843412 Change-Id: Ib6d25a9eaca5a7a6153bb1be2ddf48e3bb4538a9 Reviewed-on: https://chromium-review.googlesource.com/1063430Reviewed-by: Kinuko Yasuda <kinuko@chromium.org> Commit-Queue: Kent Tamura <tkent@chromium.org> Cr-Commit-Position: refs/heads/master@{#559465}

Replace --run-layout-test with --run-web-tests in LayoutTests/.
Bug: 843412 Change-Id: Ib6d25a9eaca5a7a6153bb1be2ddf48e3bb4538a9 Reviewed-on: https://chromium-review.googlesource.com/1063430Reviewed-by: Kinuko Yasuda <kinuko@chromium.org> Commit-Queue: Kent Tamura <tkent@chromium.org> Cr-Commit-Position: refs/heads/master@{#559465}
bbb277a8 · Kent Tamura · Commit Bot · 7c7d8f97 · bbb277a8 · bbb277a8
Commit bbb277a8 authored May 17, 2018 by Kent Tamura Committed by Commit Bot May 17, 2018
21 changed files
--- a/third_party/WebKit/LayoutTests/animations/interpolation/line-height-interpolation.html
+++ b/third_party/WebKit/LayoutTests/animations/interpolation/line-height-interpolation.html
@@ -147,7 +147,7 @@ assertInterpolation({
  {at: 1, is: '14vw'},
  {at: 1.5, is: '19vw'},
 ]);
-// content_shell --run-layout-test uses a viewport of 800x600.
+// content_shell --run-web-tests uses a viewport of 800x600.
 assertInterpolation({
  property: 'line-height',
  from: '50vmin',

--- a/third_party/WebKit/LayoutTests/fast/css/first-letter-crash-document-disposal-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css/first-letter-crash-document-disposal-expected.txt
-Test passes if it does not CRASH with --run-layout-test.
+Test passes if it does not CRASH with --run-web-tests.

 Appetizers

--- a/third_party/WebKit/LayoutTests/fast/css/first-letter-crash-document-disposal.html
+++ b/third_party/WebKit/LayoutTests/fast/css/first-letter-crash-document-disposal.html
@@ -8,7 +8,7 @@ if (window.testRunner)
  ul.menu li:first-letter { color: green; }
 </style>

-<p>Test passes if it does not CRASH with --run-layout-test.</p>
+<p>Test passes if it does not CRASH with --run-web-tests.</p>
 <div contenteditable>
  <ul class="menu">
    <li>Appetizers</li>

--- a/third_party/WebKit/LayoutTests/fast/history/frameset-repeated-name-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/history/frameset-repeated-name-expected.txt
-Tests that unique names for frames with identical name attributes don't collide. This test requires content_shell --run-layout-test to dump the back forward list.  
+Tests that unique names for frames with identical name attributes don't collide. This test requires content_shell --run-web-tests to dump the back forward list.  

 ============== Back Forward List ==============
 curr->  (file test):fast/history/frameset-repeated-name.html

--- a/third_party/WebKit/LayoutTests/fast/history/frameset-repeated-name.html
+++ b/third_party/WebKit/LayoutTests/fast/history/frameset-repeated-name.html
@@ -10,7 +10,7 @@ if (testRunner) {
 </head>
 <body>
 <p>Tests that unique names for frames with identical name attributes don't
-collide. This test requires content_shell --run-layout-test to dump the back
+collide. This test requires content_shell --run-web-tests to dump the back
 forward list.
 <iframe src="resources/frameset-dest.html"></iframe>
 <iframe src="resources/frameset-dest.html"></iframe>

--- a/third_party/WebKit/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt
 CONSOLE MESSAGE: line 1: PASS
-This test has to be run using `ContentShell --run-layout-tests` in order to see if resources were loaded and the test passed. 
+This test has to be run using `ContentShell --run-web-tests` in order to see if resources were loaded and the test passed. 

 --------
 Frame: '<!--framePath //<!--frame0-->-->'

--- a/third_party/WebKit/LayoutTests/fast/preloader/iframe-srcdoc.html
+++ b/third_party/WebKit/LayoutTests/fast/preloader/iframe-srcdoc.html
@@ -6,5 +6,5 @@
    }

 </script>
-This test has to be run using `ContentShell --run-layout-tests` in order to see if resources were loaded and the test passed.
+This test has to be run using `ContentShell --run-web-tests` in order to see if resources were loaded and the test passed.
 <iframe srcdoc="<script> window.addEventListener('DOMContentLoaded', function() { if (window.internals) console.log(internals.isPreloaded('resources/script1.js') ? 'PASS' : 'FAIL'); }, false); </script><script src=resources/non-existant.js></script><script>document.write('<plaintext>');</script> <script src=resources/script1.js></script>" />
--- a/third_party/WebKit/LayoutTests/fast/preloader/style-base-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/preloader/style-base-expected.txt
 CONSOLE MESSAGE: line 9: PASS
-This test requires content_shell --run-layout-test to see the log of what resources are loaded.
+This test requires content_shell --run-web-tests to see the log of what resources are loaded.

 <base href="resources/foo.html">
 <style>

--- a/third_party/WebKit/LayoutTests/fast/preloader/style-base.html
+++ b/third_party/WebKit/LayoutTests/fast/preloader/style-base.html
@@ -10,7 +10,7 @@ window.addEventListener('DOMContentLoaded', function() {
    }
 }, false);
 </script>
-This test requires content_shell --run-layout-test to see the log of what resources are loaded.
+This test requires content_shell --run-web-tests to see the log of what resources are loaded.
 <script src=non-existant.js></script>
 <script>document.write("<plaintext>");</script>
 <base href="resources/foo.html">

--- a/third_party/WebKit/LayoutTests/fast/text-autosizing/resources/autosizingTest.js
+++ b/third_party/WebKit/LayoutTests/fast/text-autosizing/resources/autosizingTest.js
@@ -14,7 +14,7 @@ function initAutosizingTest() {
        setWindowSizeOverride(320, 480);
    } else if (window.console && console.warn) {
        console.warn("This test depends on Text Autosizing being enabled. Run with content shell "
-                + "and --run-layout-test or manually enable Text Autosizing and either use a "
+                + "and --run-web-tests or manually enable Text Autosizing and either use a "
                + "mobile device with 320px device-width (like Nexus S or iPhone), or define "
                + "DEBUG_TEXT_AUTOSIZING_ON_DESKTOP.");
    }

--- a/third_party/WebKit/LayoutTests/fast/webgl/webgl-context-attributes-default-value.html
+++ b/third_party/WebKit/LayoutTests/fast/webgl/webgl-context-attributes-default-value.html
@@ -10,7 +10,7 @@
    depth : true,
    stencil : false,
    // FIXME: context.getContextAttributes().antialias is always false on
-    // content shell with --run-layout-test option. See http://crbug.com/375682
+    // content shell with --run-web-tests option. See http://crbug.com/375682
    // antialias : true,
    premultipliedAlpha : true,
    preserveDrawingBuffer : false,
@@ -22,7 +22,7 @@
    depth : false,
    stencil : false,
    // FIXME: context.getContextAttributes().antialias is always false on
-    // content shell with --run-layout-test option. See http://crbug.com/375682
+    // content shell with --run-web-tests option. See http://crbug.com/375682
    // antialias : true,
    premultipliedAlpha : false,
    preserveDrawingBuffer : false,

--- a/third_party/WebKit/LayoutTests/http/tests/text-autosizing/resources/autosizingTest.js
+++ b/third_party/WebKit/LayoutTests/http/tests/text-autosizing/resources/autosizingTest.js
@@ -14,7 +14,7 @@ function initAutosizingTest() {
        setWindowSizeOverride(320, 480);
    } else if (window.console && console.warn) {
        console.warn("This test depends on Text Autosizing being enabled. Run with content shell "
-                + "and --run-layout-test or manually enable Text Autosizing and either use a "
+                + "and --run-web-tests or manually enable Text Autosizing and either use a "
                + "mobile device with 320px device-width (like Nexus S or iPhone), or define "
                + "DEBUG_TEXT_AUTOSIZING_ON_DESKTOP.");
    }

--- a/third_party/WebKit/LayoutTests/http/tests/websocket/throttling.html
+++ b/third_party/WebKit/LayoutTests/http/tests/websocket/throttling.html
@@ -7,11 +7,11 @@
 // These tests test WebSocket handshake throttling, which is a feature of
 // Blink's implementation, not part of the web platform. The special throttle
 // content::TestWebSocketHandshakeThrottle is used when content_shell is run
-// with the --run-layout-test option. It detects the
+// with the --run-web-tests option. It detects the
 // content-shell-websocket-delay-ms query parameter in the URL and applies a
 // delay of the specified number of milliseconds.
 //
-// These tests will not function correctly without the --run-layout-test
+// These tests will not function correctly without the --run-web-tests
 // option. To debug them interactively you can follow the instructions for a
 // "legacy test" in
 // https://chromium.googlesource.com/chromium/src/+/master/docs/testing/layout_tests.md#Debugging-DevTools-Tests.

--- a/third_party/WebKit/LayoutTests/platform/linux/printing/forced-break-tree-dump-only-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/printing/forced-break-tree-dump-only-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 1066x827 backgroundClip at (0,0) size 800x600 clip at (0,0)
          text run at (0,0) width 554: "This is a test that only dumps the layout tree, and doesn't actually display the page. This "
          text run at (554,0) width 456: "tests some peculiarities in the test framework for printing. To run this test"
          text run at (0,20) width 102: "manually, run it "
-          text run at (102,20) width 220: "with content_shell --run-layout-test"
+          text run at (102,20) width 214: "with content_shell --run-web-tests"
      LayoutBlockFlow {DIV} at (0,56) size 1050x20
        LayoutText {#text} at (0,0) size 163x19
          text run at (0,0) width 163: "This should be on page 1."

--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spv175/printing/forced-break-tree-dump-only-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spv175/printing/forced-break-tree-dump-only-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 1066x827 backgroundClip at (0,0) size 800x600 clip at (0,0)
          text run at (0,0) width 554: "This is a test that only dumps the layout tree, and doesn't actually display the page. This "
          text run at (554,0) width 456: "tests some peculiarities in the test framework for printing. To run this test"
          text run at (0,20) width 102: "manually, run it "
-          text run at (102,20) width 220: "with content_shell --run-layout-test"
+          text run at (102,20) width 214: "with content_shell --run-web-tests"
      LayoutBlockFlow {DIV} at (0,56) size 1050x20
        LayoutText {#text} at (0,0) size 163x19
          text run at (0,0) width 163: "This should be on page 1."

--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/forced-break-tree-dump-only-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/forced-break-tree-dump-only-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 1066x827 backgroundClip at (0,0) size 800x600 clip at (0,0)
          text run at (0,0) width 554: "This is a test that only dumps the layout tree, and doesn't actually display the page. This "
          text run at (554,0) width 456: "tests some peculiarities in the test framework for printing. To run this test"
          text run at (0,20) width 102: "manually, run it "
-          text run at (102,20) width 220: "with content_shell --run-layout-test"
+          text run at (102,20) width 214: "with content_shell --run-web-tests"
      LayoutBlockFlow {DIV} at (0,56) size 1050x20
        LayoutText {#text} at (0,0) size 163x19
          text run at (0,0) width 163: "This should be on page 1."

--- a/third_party/WebKit/LayoutTests/platform/mac/printing/forced-break-tree-dump-only-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/printing/forced-break-tree-dump-only-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 1066x825 backgroundClip at (0,0) size 800x600 clip at (0,0)
          text run at (0,0) width 566: "This is a test that only dumps the layout tree, and doesn't actually display the page. This "
          text run at (565,0) width 471: "tests some peculiarities in the test framework for printing. To run this test"
          text run at (0,18) width 105: "manually, run it "
-          text run at (104,18) width 228: "with content_shell --run-layout-test"
+          text run at (104,18) width 221: "with content_shell --run-web-tests"
      LayoutBlockFlow {DIV} at (0,52) size 1050x18
        LayoutText {#text} at (0,0) size 165x18
          text run at (0,0) width 165: "This should be on page 1."

--- a/third_party/WebKit/LayoutTests/platform/win/printing/forced-break-tree-dump-only-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/printing/forced-break-tree-dump-only-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 1066x827 backgroundClip at (0,0) size 800x600 clip at (0,0)
          text run at (0,0) width 526: "This is a test that only dumps the layout tree, and doesn't actually display the page. This "
          text run at (526,0) width 515: "tests some peculiarities in the test framework for printing. To run this test manually, run"
          text run at (0,20) width 11: "it "
-          text run at (11,20) width 211: "with content_shell --run-layout-test"
+          text run at (11,20) width 207: "with content_shell --run-web-tests"
      LayoutBlockFlow {DIV} at (0,56) size 1050x20
        LayoutText {#text} at (0,0) size 155x19
          text run at (0,0) width 155: "This should be on page 1."

--- a/third_party/WebKit/LayoutTests/printing/forced-break-tree-dump-only.html
+++ b/third_party/WebKit/LayoutTests/printing/forced-break-tree-dump-only.html
@@ -10,7 +10,7 @@
 </script>
 <p>This is a test that only dumps the layout tree, and doesn't actually display the page. This
    tests some peculiarities in the test framework for printing. To run this test manually, run it
-    with content_shell --run-layout-test</p>
+    with content_shell --run-web-tests</p>
 <div>This should be on page 1.</div>
 <div style="page-break-before:always;">
    This should be on page 2.

--- a/third_party/WebKit/LayoutTests/scrollingcoordinator/non-fast-scrollable-visibility-change.html
+++ b/third_party/WebKit/LayoutTests/scrollingcoordinator/non-fast-scrollable-visibility-change.html
@@ -135,7 +135,7 @@
  }

  // Appends to container an scrollable element of the given type.
-  // Note that because this layout test runs with --run-layout-test flag
+  // Note that because this layout test runs with --run-web-tests flag
  // the appended scrollable is always non-fast even on HDPI platforms.
  function appendScrollable(container, type, nextStep) {
    var inner;

--- a/third_party/WebKit/LayoutTests/svg/animations/smil-scheduled-in-inactive-document-crash.html
+++ b/third_party/WebKit/LayoutTests/svg/animations/smil-scheduled-in-inactive-document-crash.html
@@ -12,7 +12,7 @@ description("SMIL animations scheduled in inactive document cause crash");
 debug("PASS if no crash on debug builds");

 if (!window.eventSender)
-    testFailed("Please run this in content_shell --run-layout-test")
+    testFailed("Please run this in content_shell --run-web-tests")

 var svg = document.querySelector("svg");
 svg.pauseAnimations();