12 files changed, 26 insertions, 26 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/box-ordinal-group.html b/third_party/WebKit/LayoutTests/fast/flexbox/box-ordinal-group.html
index f6edee4..42a02e1 100644
--- a/third_party/WebKit/LayoutTests/fast/flexbox/box-ordinal-group.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/box-ordinal-group.html
@@ -45,8 +45,8 @@ div.number {
 
 </style>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 <body>
 <p>
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/box-size-integer-overflow.html b/third_party/WebKit/LayoutTests/fast/flexbox/box-size-integer-overflow.html
index e998676..598b6b4 100644
--- a/third_party/WebKit/LayoutTests/fast/flexbox/box-size-integer-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/box-size-integer-overflow.html
@@ -2,8 +2,8 @@
 <head>
 <script>
 window.onload = function() {
-  if (window.layoutTestController)
-    window.layoutTestController.dumpAsText();
+  if (window.testRunner)
+    window.testRunner.dumpAsText();
 
   var cell = document.getElementById("cell");
   var text = cell.firstElementChild;
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-input-autofocus.html b/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-input-autofocus.html
index 4763ff3..c20eb46 100755
--- a/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-input-autofocus.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-input-autofocus.html
@@ -2,8 +2,8 @@
 <body>
 <p style="visibility: collapse;"><button><input autofocus><input id="test"></input></button></p>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 document.body.offsetTop;
 document.getElementById('test').parentNode.removeChild(document.getElementById('test'));
 document.body.offsetTop;
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-keygen.html b/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-keygen.html
index 7cf441e..1fe47b8 100755
--- a/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-keygen.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-keygen.html
@@ -2,8 +2,8 @@
 <body>
 <p style="visibility: collapse;"><button><keygen autofocus><input id="test"></keygen></button></p>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 document.body.offsetTop;
 document.getElementById('test').parentNode.removeChild(document.getElementById('test'));
 document.body.offsetTop;
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-relayout.html b/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-relayout.html
index 49a6d2a..015900a 100755
--- a/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-relayout.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/crash-button-relayout.html
@@ -2,8 +2,8 @@
 <body>
 <p style="visibility: collapse;"><button><input><script>document.getElementsByTagName('input')[0].offsetTop;</script><input id="test"></input></button></p>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 document.body.offsetTop;
 document.getElementById('test').parentNode.removeChild(document.getElementById('test'));
 document.body.offsetTop;
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/crash-flexbox-no-layout-child.html b/third_party/WebKit/LayoutTests/fast/flexbox/crash-flexbox-no-layout-child.html
index 636505e..8c1c9b4 100644
--- a/third_party/WebKit/LayoutTests/fast/flexbox/crash-flexbox-no-layout-child.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/crash-flexbox-no-layout-child.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function boom() {
   setTimeout('document.querySelector("progress").setAttribute("style", "overflow: scroll; border-style: dotted;");', 10);
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/horizontal-box-float-crash.html b/third_party/WebKit/LayoutTests/fast/flexbox/horizontal-box-float-crash.html
index 3850e6c..fe4a9a6 100644
--- a/third_party/WebKit/LayoutTests/fast/flexbox/horizontal-box-float-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/horizontal-box-float-crash.html
@@ -1,8 +1,8 @@
 <html>
 <body onload="runTest()">
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function runTest()
     {
@@ -14,10 +14,10 @@
         test.appendChild(blockquote);
         document.body.offsetTop;
         test.parentNode.removeChild(test);
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             // Force a focus in which forces a paint that can trigger the crash.
-            layoutTestController.setWindowIsKey(false);
-            layoutTestController.setWindowIsKey(true);
+            testRunner.setWindowIsKey(false);
+            testRunner.setWindowIsKey(true);
             document.getElementById("results").innerHTML = "PASS";
         }
     }
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/inline-children-crash.html b/third_party/WebKit/LayoutTests/fast/flexbox/inline-children-crash.html
index 57a919b..1c21a73 100644
--- a/third_party/WebKit/LayoutTests/fast/flexbox/inline-children-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/inline-children-crash.html
@@ -14,8 +14,8 @@
 }
 </style>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/layoutHorizontalBox-crash.html b/third_party/WebKit/LayoutTests/fast/flexbox/layoutHorizontalBox-crash.html
index d4addfa..0ce8998 100755
--- a/third_party/WebKit/LayoutTests/fast/flexbox/layoutHorizontalBox-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/layoutHorizontalBox-crash.html
@@ -3,8 +3,8 @@
 .c6:nth-last-child(2n+10000000000000000) { text-align: -webkit-center; width: 10px; }
 .c26:first-letter { visibility: inherit; overflow: scroll; float: left;</style>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function runTest() {
     var button = document.createElement('button');
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/line-clamp-crash.html b/third_party/WebKit/LayoutTests/fast/flexbox/line-clamp-crash.html
index 8746f13..2fbed39 100644
--- a/third_party/WebKit/LayoutTests/fast/flexbox/line-clamp-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/line-clamp-crash.html
@@ -29,8 +29,8 @@
         placeholder.parentNode.removeChild(placeholder);
     }
 
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     document.body.offsetTop;
     test();
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html b/third_party/WebKit/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html
index 8729451..44cd2eb 100755
--- a/third_party/WebKit/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html
@@ -14,8 +14,8 @@
 }
 </style>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function runTest() {
     document.body.offsetTop;
diff --git a/third_party/WebKit/LayoutTests/fast/flexbox/resources/box-orient-button.js b/third_party/WebKit/LayoutTests/fast/flexbox/resources/box-orient-button.js
index 7259891..8fe6ca4 100644
--- a/third_party/WebKit/LayoutTests/fast/flexbox/resources/box-orient-button.js
+++ b/third_party/WebKit/LayoutTests/fast/flexbox/resources/box-orient-button.js
@@ -21,5 +21,5 @@ shouldBe("gebi('toHorizontal').clientHeight", "referenceHorizontalHeight");
 shouldBe("gebi('toVertical').clientHeight", "referenceVerticalHeight");
 
 // If we are in DTR, we don't need meaningless messages.
-if (window.layoutTestController)
+if (window.testRunner)
     document.getElementById("main").innerHTML = "";