Use testRunner instead of layoutTestController in fast/fast-mobile-scrolling, flexbox, forms, frames, gradients tests

https://bugs.webkit.org/show_bug.cgi?id=89741

Reviewed by Kent Tamura.

* fast/flexbox/box-ordinal-group.html:
* fast/flexbox/box-size-integer-overflow.html:
* fast/flexbox/crash-button-input-autofocus.html:
* fast/flexbox/crash-button-keygen.html:
* fast/flexbox/crash-button-relayout.html:
* fast/flexbox/crash-flexbox-no-layout-child.html:
* fast/flexbox/horizontal-box-float-crash.html:
* fast/flexbox/inline-children-crash.html:
* fast/flexbox/layoutHorizontalBox-crash.html:
* fast/flexbox/line-clamp-crash.html:
* fast/flexbox/overhanging-floats-not-removed-crash.html:
* fast/flexbox/resources/box-orient-button.js:
* fast/forms/:
* fast/frames/:
* fast/gradients/crash-on-1px-border.html:
* fast/gradients/crash-on-degenerate-gradient.html:
* fast/gradients/crash-on-remove.html:
* fast/gradients/crash-on-tr.html:
* fast/gradients/css3-color-stop-units.html:
* fast/gradients/css3-color-stops.html:
* fast/gradients/css3-linear-angle-gradients.html:
* fast/gradients/css3-linear-right-angle-gradients.html:
* fast/gradients/css3-radial-gradient-crash.html:
* fast/gradients/css3-radial-gradients.html:
* fast/gradients/css3-radial-gradients2.html:
* fast/gradients/css3-radial-gradients3.html:
* fast/gradients/css3-repeating-end-fill.html:
* fast/gradients/css3-repeating-linear-gradients.html:
* fast/gradients/css3-repeating-linear-gradients2.html:
* fast/gradients/css3-repeating-radial-gradients.html:
* fast/gradients/gradient-after-transparent-border.html:
* fast/gradients/gradient-on-pseudoelement-crash.html:
* platform/chromium/fast/forms/search-popup-crasher.html:
* platform/gtk/fast/forms/menulist-typeahead-find.html:
* platform/gtk/fast/frames/scrolling-iframe-out-of-viewport.html:
* platform/mac/fast/forms/attributed-strings.html:
* platform/mac/fast/forms/listbox-scrollbar-hit-test.html:
* platform/mac/fast/forms/script-tests/focus-option-control-on-page.js:
(startTest):
(runKeyPresses):
(notifyDone):


git-svn-id: svn://svn.chromium.org/blink/trunk@121008 bbb929c8-8fbe-4397-9dbb-9b2b20218538

554 files changed, 1667 insertions, 1618 deletions

diff --git a/third_party/WebKit/LayoutTests/ChangeLog b/third_party/WebKit/LayoutTests/ChangeLog
index 0964e0c..267b2c4 100644
--- a/third_party/WebKit/LayoutTests/ChangeLog
+++ b/third_party/WebKit/LayoutTests/ChangeLog
@@ -1,3 +1,52 @@
+2012-06-21  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Use testRunner instead of layoutTestController in fast/fast-mobile-scrolling, flexbox, forms, frames, gradients tests
+        https://bugs.webkit.org/show_bug.cgi?id=89741
+
+        Reviewed by Kent Tamura.
+
+        * fast/flexbox/box-ordinal-group.html:
+        * fast/flexbox/box-size-integer-overflow.html:
+        * fast/flexbox/crash-button-input-autofocus.html:
+        * fast/flexbox/crash-button-keygen.html:
+        * fast/flexbox/crash-button-relayout.html:
+        * fast/flexbox/crash-flexbox-no-layout-child.html:
+        * fast/flexbox/horizontal-box-float-crash.html:
+        * fast/flexbox/inline-children-crash.html:
+        * fast/flexbox/layoutHorizontalBox-crash.html:
+        * fast/flexbox/line-clamp-crash.html:
+        * fast/flexbox/overhanging-floats-not-removed-crash.html:
+        * fast/flexbox/resources/box-orient-button.js:
+        * fast/forms/:
+        * fast/frames/:
+        * fast/gradients/crash-on-1px-border.html:
+        * fast/gradients/crash-on-degenerate-gradient.html:
+        * fast/gradients/crash-on-remove.html:
+        * fast/gradients/crash-on-tr.html:
+        * fast/gradients/css3-color-stop-units.html:
+        * fast/gradients/css3-color-stops.html:
+        * fast/gradients/css3-linear-angle-gradients.html:
+        * fast/gradients/css3-linear-right-angle-gradients.html:
+        * fast/gradients/css3-radial-gradient-crash.html:
+        * fast/gradients/css3-radial-gradients.html:
+        * fast/gradients/css3-radial-gradients2.html:
+        * fast/gradients/css3-radial-gradients3.html:
+        * fast/gradients/css3-repeating-end-fill.html:
+        * fast/gradients/css3-repeating-linear-gradients.html:
+        * fast/gradients/css3-repeating-linear-gradients2.html:
+        * fast/gradients/css3-repeating-radial-gradients.html:
+        * fast/gradients/gradient-after-transparent-border.html:
+        * fast/gradients/gradient-on-pseudoelement-crash.html:
+        * platform/chromium/fast/forms/search-popup-crasher.html:
+        * platform/gtk/fast/forms/menulist-typeahead-find.html:
+        * platform/gtk/fast/frames/scrolling-iframe-out-of-viewport.html:
+        * platform/mac/fast/forms/attributed-strings.html:
+        * platform/mac/fast/forms/listbox-scrollbar-hit-test.html:
+        * platform/mac/fast/forms/script-tests/focus-option-control-on-page.js:
+        (startTest):
+        (runKeyPresses):
+        (notifyDone):
+
 2012-06-21  Joone Hur  <joone.hur@intel.com>
 
         [EFL] Unreviewed gardening, unskip now passing tests.
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 = "";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/11423.html b/third_party/WebKit/LayoutTests/fast/forms/11423.html
index 24a73a5..58f4e70 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/11423.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/11423.html
@@ -10,8 +10,8 @@ function log(str) {
     console.appendChild(li);
 }
 
-if (window.layoutTestController)
-    window.layoutTestController.dumpAsText();
+if (window.testRunner)
+    window.testRunner.dumpAsText();
     
 var textarea = document.getElementById("textarea");
 textarea.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/25153.html b/third_party/WebKit/LayoutTests/fast/forms/25153.html
index a3c471a..1b1693f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/25153.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/25153.html
@@ -2,8 +2,8 @@ This tests to make sure that clicking inside a text field places the caret in it
 <input id="textfield" onFocus="window.scrollBy(0, 40)" value="click in me"><br>
 <div style="height: 1500px;">
 <script>
-if (window.layoutTestController) {
-    window.layoutTestController.dumpAsText();
+if (window.testRunner) {
+    window.testRunner.dumpAsText();
     textfield = document.getElementById("textfield");
     // Click near the end of the field so that the caret after all of the text inside it.
     x = textfield.offsetParent.offsetLeft + textfield.offsetLeft + textfield.offsetWidth - 5;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/4628409.html b/third_party/WebKit/LayoutTests/fast/forms/4628409.html
index c06864c..3045678 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/4628409.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/4628409.html
@@ -1,8 +1,8 @@
 <p>This tests for a crash when inserting text into a textarea that has been shrunk to zero rows just before the insertion.</p>
 <textarea id="textarea" rows="1"></textarea>
 <script>
-if (window.layoutTestController)
-    window.layoutTestController.dumpAsText();
+if (window.testRunner)
+    window.testRunner.dumpAsText();
 var e = document.getElementById("textarea");
 e.setSelectionRange(0, 0);
 e.rows = 0;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/8250.html b/third_party/WebKit/LayoutTests/fast/forms/8250.html
index db5acdc..08d0cee 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/8250.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/8250.html
@@ -8,8 +8,8 @@ The text field should have a space in it, followed by the word 'foo'.</p>
 
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var e = document.getElementById("test");
 e.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected.html b/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected.html
index 1c2d5f8..5a81b39 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected.html
@@ -5,8 +5,8 @@
         </style>
         <script type="text/javascript">
         function runTest() {
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
             var console = document.getElementById('console');
             var theOption = document.getElementById('theOption');
             console.innerHTML += theOption.selected + "<br>";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected2.html b/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected2.html
index 876e51c..e3b638c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected2.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected2.html
@@ -9,8 +9,8 @@
       <option id="theOption">lalala</option>
     </select>
     <script>
-      if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+      if (window.testRunner)
+        testRunner.dumpAsText();
       var o = document.getElementById('theOption');
       document.getElementById('logOne').textContent = o.selected;
       document.getElementById('logTwo').textContent = document.getElementById('theSelect').selectedIndex;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected3.html b/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected3.html
index 2520abe..eacabca 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected3.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/HTMLOptionElement_selected3.html
@@ -8,8 +8,8 @@
     <select id="theSelect" style="display:none">
       <option id="theOption">lalala</option>
     <script>
-      if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+      if (window.testRunner)
+        testRunner.dumpAsText();
       var o = document.getElementById('theOption');
       document.getElementById('logOne').textContent = o.selected;
       document.getElementById('logTwo').textContent = document.getElementById('theSelect').selectedIndex;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-001.html b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-001.html
index 5c6ba09..3c5248e 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-001.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-001.html
@@ -16,8 +16,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         v = document.getElementsByName("victim");
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-002.html b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-002.html
index db3ae16..62e40bd 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-002.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-002.html
@@ -7,8 +7,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         v = document.getElementsByName("victim");
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-removed-control.html b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-removed-control.html
index d517e5f..e1c57a8 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-removed-control.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-removed-control.html
@@ -14,8 +14,8 @@ function gc()
 
 function runTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var validity = document.getElementById("control").validity;
     document.body.removeChild(document.getElementById("control"));
     gc();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-004.html b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-004.html
index e369c54..4dad439 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-004.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-004.html
@@ -7,8 +7,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         v = document.getElementsByName("victim");
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-005.html b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-005.html
index 01c5d20..5dd5ce7 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-005.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-005.html
@@ -7,8 +7,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         v = document.getElementsByName("victim");
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-006.html b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-006.html
index 275d89d..0df4473 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-006.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-006.html
@@ -7,8 +7,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         v = document.getElementsByName("victim");
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-008.html b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-008.html
index fed24d6..238dacb 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-008.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-008.html
@@ -7,8 +7,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         v = document.getElementsByName("victim");
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-009.html b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-009.html
index ed905a5..e749efe 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-009.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/ValidityState-valueMissing-009.html
@@ -7,8 +7,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         v = document.getElementsByName("victim");
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/access-key.html b/third_party/WebKit/LayoutTests/fast/forms/access-key.html
index 21d70f4..b39b90c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/access-key.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/access-key.html
@@ -17,8 +17,8 @@ function pressKey(key)
 }
 function test()
 {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
 
         for (i = 1; i <= 9; i++)
             pressKey(i.toString());
diff --git a/third_party/WebKit/LayoutTests/fast/forms/activate-and-disabled-elements.html b/third_party/WebKit/LayoutTests/fast/forms/activate-and-disabled-elements.html
index 9ae4fab..f7cbd35 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/activate-and-disabled-elements.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/activate-and-disabled-elements.html
@@ -10,8 +10,8 @@
             }
             
             function runTest() {
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
                     
                 var button = document.getElementById('button');
                 var input = document.getElementById('input');            
diff --git a/third_party/WebKit/LayoutTests/fast/forms/add-and-remove-option.html b/third_party/WebKit/LayoutTests/fast/forms/add-and-remove-option.html
index 633903c..57df475 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/add-and-remove-option.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/add-and-remove-option.html
@@ -8,8 +8,8 @@ Cannot change SELECT to a dynamically created option.</p>
 </form>
 <div id=res></div>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function log(msg)
     {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/add-remove-form-elements-stress-test.html b/third_party/WebKit/LayoutTests/fast/forms/add-remove-form-elements-stress-test.html
index ea5d7dd..c4d4ea5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/add-remove-form-elements-stress-test.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/add-remove-form-elements-stress-test.html
@@ -1,8 +1,8 @@
 <script>
 
 function test() {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var inputs = "";
     for (i = 0; i != 500; ++i)
diff --git a/third_party/WebKit/LayoutTests/fast/forms/add-remove-option-modification-event.html b/third_party/WebKit/LayoutTests/fast/forms/add-remove-option-modification-event.html
index 7fa95f2..e45735f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/add-remove-option-modification-event.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/add-remove-option-modification-event.html
@@ -6,8 +6,8 @@
 </form>
 <div id=res></div>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function log(msg)
     {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/add-selected-option.html b/third_party/WebKit/LayoutTests/fast/forms/add-selected-option.html
index 68c183f..eb82972 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/add-selected-option.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/add-selected-option.html
@@ -38,8 +38,8 @@ Cannot change SELECT to a dynamically created option.</p>
         }
     }
     
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var results = document.createElement('div');
     results.id = "res";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-attribute.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-attribute.html
index 2dab6fa..215bda4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-attribute.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-attribute.html
@@ -7,8 +7,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
       
         var a = document.getElementsByTagName("input");
         for (i = 0; i < a.length; i++)
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-input-css-style-change.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-input-css-style-change.html
index 79c7771..a20e55a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-input-css-style-change.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-input-css-style-change.html
@@ -9,8 +9,8 @@ input:focus { background: green; }
 <input type="text" id="test" autofocus>
 <div id="result">FAIL</div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
 }
 
 var test = document.getElementById("test");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-001.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-001.html
index e8497c7..3b94e88 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-001.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-001.html
@@ -11,8 +11,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
             
         if (document.activeElement == document.getElementsByTagName("input")[0])
             log("SUCCESS");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-002.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-002.html
index 93c600f..fa70b57 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-002.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-002.html
@@ -11,8 +11,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
             
         if (document.activeElement == document.getElementsByTagName("input")[0])
             log("SUCCESS");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-003.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-003.html
index 7ba259a..b5d213f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-003.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-003.html
@@ -12,8 +12,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         if (document.activeElement == document.getElementsByTagName("input")[0] &&
             document.body.scrollTop != 0)
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-004.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-004.html
index b403d63..4a3dfc4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-004.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-004.html
@@ -11,9 +11,9 @@
     }
 
     function test() {
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
         }
         var input = document.getElementsByTagName('input')[0];
         var p = document.getElementsByTagName('p')[0];
@@ -30,8 +30,8 @@
         else
             log("FAILURE");
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-005.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-005.html
index 66421da6..5098c0a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-005.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-005.html
@@ -17,9 +17,9 @@
         input.autofocus = true;
         p.appendChild(input);
 
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
         }
         
         setTimeout(check, 0);
@@ -31,8 +31,8 @@
         else
             log("FAILURE");
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-006.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-006.html
index 955dec6..3da3934 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-006.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-006.html
@@ -11,8 +11,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         if (document.activeElement == document.getElementById("test"))
             log("SUCCESS");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-007.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-007.html
index c60c9ae..1125b5b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-007.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-007.html
@@ -17,8 +17,8 @@
     }
     
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         if (gotBlur)
             log("SUCCESS");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-008.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-008.html
index d42982c..2afe603 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-008.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-opera-008.html
@@ -13,8 +13,8 @@
     function test() {
         document.getElementsByTagName('input')[0].focus();
         
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         if (document.activeElement == document.getElementsByTagName('input')[0])
             log("SUCCESS");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/autofocus-readonly-attribute.html b/third_party/WebKit/LayoutTests/fast/forms/autofocus-readonly-attribute.html
index 3f03978..34c8ca7 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/autofocus-readonly-attribute.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/autofocus-readonly-attribute.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(msg) {
     var console = document.getElementById("console");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/button-click-DOM.html b/third_party/WebKit/LayoutTests/fast/forms/button-click-DOM.html
index 6acdb72..08f2512 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/button-click-DOM.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/button-click-DOM.html
@@ -2,8 +2,8 @@
 <script>
 function test() {
     document.getElementById("thebutton").click(); 
-    if (window.layoutTestController) 
-        layoutTestController.dumpAsText();
+    if (window.testRunner) 
+        testRunner.dumpAsText();
 }
 
 function clicky() {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/button-enter-click.html b/third_party/WebKit/LayoutTests/fast/forms/button-enter-click.html
index 115ca63..115c859 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/button-enter-click.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/button-enter-click.html
@@ -4,8 +4,8 @@
     function test() {
         var bt = document.getElementById('bt');
         bt.focus();
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
             eventSender.keyDown("\r", []);
         }
     }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/button-in-forms-collection.html b/third_party/WebKit/LayoutTests/fast/forms/button-in-forms-collection.html
index 67ede9e..8577b49 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/button-in-forms-collection.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/button-in-forms-collection.html
@@ -3,8 +3,8 @@
 
 <script src="../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function testPassed(msg)
 {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/button-spacebar-click.html b/third_party/WebKit/LayoutTests/fast/forms/button-spacebar-click.html
index 98ddbe29..4a41a8b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/button-spacebar-click.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/button-spacebar-click.html
@@ -4,8 +4,8 @@
     function test() {
         var bt = document.getElementById('bt');
         bt.focus();
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
             eventSender.keyDown(' ');
         }
     }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/button-state-restore.html b/third_party/WebKit/LayoutTests/fast/forms/button-state-restore.html
index 4368a49..cc75ab6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/button-state-restore.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/button-state-restore.html
@@ -16,14 +16,14 @@
 
                 document.getElementById("result").innerText = result;
 
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
                 return;
             }
 
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
             }
 
             beenHere.value = "FAIL";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/caret-rtl.html b/third_party/WebKit/LayoutTests/fast/forms/caret-rtl.html
index 8bb4e85..afa58c0 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/caret-rtl.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/caret-rtl.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController)
-     layoutTestController.dumpEditingCallbacks();
+if (window.testRunner)
+     testRunner.dumpEditingCallbacks();
 
 function runTest()
 {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/change-form-element-document-crash.html b/third_party/WebKit/LayoutTests/fast/forms/change-form-element-document-crash.html
index 4925401..03d9fdd 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/change-form-element-document-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/change-form-element-document-crash.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function gc() {
     if (window.GCController)
diff --git a/third_party/WebKit/LayoutTests/fast/forms/checkbox-appearance-change-by-checked.html b/third_party/WebKit/LayoutTests/fast/forms/checkbox-appearance-change-by-checked.html
index 09f1475..039d4fa 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/checkbox-appearance-change-by-checked.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/checkbox-appearance-change-by-checked.html
@@ -5,11 +5,11 @@
 <script>
 var checkbox = document.getElementsByTagName('input')[0];
 checkbox.offsetTop;
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 setTimeout(function() {
     checkbox.checked = true;
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, 0);
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/clone-input-with-dirty-value.html b/third_party/WebKit/LayoutTests/fast/forms/clone-input-with-dirty-value.html
index 23df042..bb61320 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/clone-input-with-dirty-value.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/clone-input-with-dirty-value.html
@@ -7,8 +7,8 @@ The cloned input element should retain the edited value and you should see PASSE
 <div><input id="test" title="1" type="text" value="FAIL"></div>
 <script type="text/javascript">
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var test = document.getElementById('test');
 test.value = 'PASS';
diff --git a/third_party/WebKit/LayoutTests/fast/forms/cursor-at-editable-content-boundary.html b/third_party/WebKit/LayoutTests/fast/forms/cursor-at-editable-content-boundary.html
index 3d677be..0f8d502 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/cursor-at-editable-content-boundary.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/cursor-at-editable-content-boundary.html
@@ -16,8 +16,8 @@ var succeed = true;
 
 function runTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     // The 2nd parameter 22 is the last character in textarea with id "textarea_rtl".
     testCaretRect("textarea_rtl", 22, "rtl", "horizontal");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/cursor-position.html b/third_party/WebKit/LayoutTests/fast/forms/cursor-position.html
index 01a109b0..cd7c822 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/cursor-position.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/cursor-position.html
@@ -9,8 +9,8 @@
             }
             function test()
             {
-                if (window.layoutTestController) {
-                    layoutTestController.dumpAsText();
+                if (window.testRunner) {
+                    testRunner.dumpAsText();
                 }
 
                 var elt = document.getElementById("text");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/dangling-form-element-crash.html b/third_party/WebKit/LayoutTests/fast/forms/dangling-form-element-crash.html
index f5d097e..2cee960 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/dangling-form-element-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/dangling-form-element-crash.html
@@ -1,8 +1,8 @@
 <html>
   <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function gc() {
@@ -18,8 +18,8 @@
         form.id = 'foo';
         document.body.appendChild(form);
         document.body.innerHTML += 'PASS';
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
     function test() {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/defer-updateFromElement.html b/third_party/WebKit/LayoutTests/fast/forms/defer-updateFromElement.html
index 423cc30..bd6195b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/defer-updateFromElement.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/defer-updateFromElement.html
@@ -6,8 +6,8 @@
 <iframe></iframe>
 <textarea id="target">Test did not run</textarea>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var target = document.getElementById("target");
     target.offsetTop;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/delete-text-with-invisible-br.html b/third_party/WebKit/LayoutTests/fast/forms/delete-text-with-invisible-br.html
index 840c5d4..710362f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/delete-text-with-invisible-br.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/delete-text-with-invisible-br.html
@@ -25,8 +25,8 @@ document.execCommand('InsertText', false, 'PASS');
 if (test.value != 'PASS')
     test.value = 'FAIL';
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
     test.parentNode.parentNode.style.display = 'none';
     document.writeln(test.value);
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/disabled-mousedown-event.html b/third_party/WebKit/LayoutTests/fast/forms/disabled-mousedown-event.html
index b4b4d77..05ed92c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/disabled-mousedown-event.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/disabled-mousedown-event.html
@@ -6,8 +6,8 @@
 <div id="log">FAIL</div>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function clickOn(element)
 {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/disabled-search-input.html b/third_party/WebKit/LayoutTests/fast/forms/disabled-search-input.html
index e40bab1..86ef56a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/disabled-search-input.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/disabled-search-input.html
@@ -2,9 +2,9 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var logDiv;
@@ -42,7 +42,7 @@ function runTest()
         eventSender.mouseUp();
         eventSender.keyDown('a');
         log('The inner text element of the search input should never be 0-height', input.value == 'a');
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     }, 0);
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/display-none-in-onchange-keyboard.html b/third_party/WebKit/LayoutTests/fast/forms/display-none-in-onchange-keyboard.html
index 52b2d0c..a525d87 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/display-none-in-onchange-keyboard.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/display-none-in-onchange-keyboard.html
@@ -2,8 +2,8 @@
 <head>
     <script>
     function runTest() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
         else {
             alert('This test does not work in Safari.');
             return;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/document-write-empty.html b/third_party/WebKit/LayoutTests/fast/forms/document-write-empty.html
index e936d24..3fc4f67 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/document-write-empty.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/document-write-empty.html
@@ -5,8 +5,8 @@
 
  <p>There should not be any text below this sentence.</p>
   <script>
-  if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+  if (window.testRunner)
+    testRunner.dumpAsText();
   document.write() 
   </script>
  
diff --git a/third_party/WebKit/LayoutTests/fast/forms/document-write.html b/third_party/WebKit/LayoutTests/fast/forms/document-write.html
index 3d458f7..e771379 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/document-write.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/document-write.html
@@ -4,9 +4,9 @@
 function test() {
   if (document.URL.indexOf('?') == -1) {
 
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
     
     document.write("<html><body>" +
@@ -16,8 +16,8 @@ function test() {
     "pt></body></html>");
   } else {
     document.getElementById("result").innerHTML="SUCCESS";
-    if (window.layoutTestController)
-      layoutTestController.notifyDone();
+    if (window.testRunner)
+      testRunner.notifyDone();
   }
   
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/domstring-replace-crash.html b/third_party/WebKit/LayoutTests/fast/forms/domstring-replace-crash.html
index 3862982..aa5d022 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/domstring-replace-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/domstring-replace-crash.html
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head>
 <script type="text/javascript">
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 <title>
 </title>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/double-focus.html b/third_party/WebKit/LayoutTests/fast/forms/double-focus.html
index a882cbd..1b631ad 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/double-focus.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/double-focus.html
@@ -13,8 +13,8 @@
 
             function test()
             {
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
 
                 testElement(document.getElementById("textarea"));
                 testElement(document.getElementById("input"));
diff --git a/third_party/WebKit/LayoutTests/fast/forms/drag-into-textarea.html b/third_party/WebKit/LayoutTests/fast/forms/drag-into-textarea.html
index b856ade..1625eb1 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/drag-into-textarea.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/drag-into-textarea.html
@@ -11,13 +11,13 @@ function runTest() {
 
     input.select();
 
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
     if (!window.eventSender)
         return;
 
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
     
     eventSender.mouseMoveTo(x, y);
     eventSender.mouseDown();
@@ -31,7 +31,7 @@ function runTest() {
     else
         document.getElementById("result").innerText = "Test failed! Input value was " + input.value + " and text area value was " + textarea.value + ".";
 
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/drag-out-of-textarea.html b/third_party/WebKit/LayoutTests/fast/forms/drag-out-of-textarea.html
index 13c59c2..aabdf4a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/drag-out-of-textarea.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/drag-out-of-textarea.html
@@ -11,13 +11,13 @@ function runTest() {
 
     textarea.select();
 
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
     if (!window.eventSender)
         return;
 
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 
     eventSender.mouseMoveTo(tx, ty);
     eventSender.mouseDown();
@@ -31,7 +31,7 @@ function runTest() {
     else
         document.getElementById("result").innerText = "Test failed! Input value was " + input.value + " and text area value was " + textarea.value + ".";
 
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/element-by-name.html b/third_party/WebKit/LayoutTests/fast/forms/element-by-name.html
index 8ebe048..4bf7eac 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/element-by-name.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/element-by-name.html
@@ -3,8 +3,8 @@
 <script>
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     document.getElementById("putElementHere").innerHTML = "<input type='text' name='testElement' value='test element contents'>";
     document.testForm.testElement.focus();
     document.getElementById("result").innerText = "Form element was found.";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/element-order.html b/third_party/WebKit/LayoutTests/fast/forms/element-order.html
index b349f49..ca83fe7 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/element-order.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/element-order.html
@@ -2,8 +2,8 @@
 <head>
 <script>
 function test() {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var f = window.document.forms[0];
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/empty-get.html b/third_party/WebKit/LayoutTests/fast/forms/empty-get.html
index 07f646c..b588b51 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/empty-get.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/empty-get.html
@@ -11,9 +11,9 @@ Empty forms are submitted incorrectly.</p>
 </form>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.URL.indexOf('?') == -1) {
@@ -27,8 +27,8 @@ if (document.URL.indexOf('?') == -1) {
     else
         document.write("<p>Failure</p>");
     
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/empty-textarea-toggle-disabled.html b/third_party/WebKit/LayoutTests/fast/forms/empty-textarea-toggle-disabled.html
index 57b897a..3f48dfd 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/empty-textarea-toggle-disabled.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/empty-textarea-toggle-disabled.html
@@ -4,9 +4,9 @@ the test succeeded.<p>
 <textarea id="ta" disabled="disabled"></textarea>
 
 <script type="text/javascript">
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 setTimeout(function() {
@@ -20,7 +20,7 @@ setTimeout(function() {
         else
             document.write("<pre>FAIL, result was '" + result + "'.</pre>");
     }
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, 0);
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/enter-clicks-buttons.html b/third_party/WebKit/LayoutTests/fast/forms/enter-clicks-buttons.html
index d7cc3e7..85d1dd6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/enter-clicks-buttons.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/enter-clicks-buttons.html
@@ -22,8 +22,8 @@ function logEvent(event)
 
 function loaded()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var keys = ['\r', ' '];
     var keyNames = ['Enter', 'U+0020'];
diff --git a/third_party/WebKit/LayoutTests/fast/forms/fallback-content-submission.html b/third_party/WebKit/LayoutTests/fast/forms/fallback-content-submission.html
index 924de25..9847ff9 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/fallback-content-submission.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/fallback-content-submission.html
@@ -6,9 +6,9 @@
 <iframe name="tg"></iframe>
 <div id="result"></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 window.onload = function() {
@@ -19,8 +19,8 @@ window.onload = function() {
             document.getElementById('result').textContent = "PASS";
         else
             document.getElementById('result').textContent = "FAIL: actual=" + actual_search;
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }, false);
 
     document.getElementsByTagName('form')[0].submit();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/fieldset/fieldset-crash.html b/third_party/WebKit/LayoutTests/fast/forms/fieldset/fieldset-crash.html
index 37b2bf6..77a81a9 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/fieldset/fieldset-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/fieldset/fieldset-crash.html
@@ -2,8 +2,8 @@
 <html>
 Test passes if it does not crash.
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function onloadHandler()
 {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/disabling-file-busy-loop.html b/third_party/WebKit/LayoutTests/fast/forms/file/disabling-file-busy-loop.html
index 79765ee..a41afc1 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/disabling-file-busy-loop.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/disabling-file-busy-loop.html
@@ -9,8 +9,8 @@
 <input type="file" id="fileUpload">
 <div id=console></div>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 document.getElementById('fileUpload').disabled = true;
 document.getElementById('console').innerText = 'PASS if this text is visible.';
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event.html
index 46ae3fe..89a80d9 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event.html
@@ -12,7 +12,7 @@ var changeDispatched;
 
 description("This tests the condition that triggers a 'change' event on file input forms.");
 
-if (window.layoutTestController) {
+if (window.testRunner) {
     var singleFileInput = document.getElementById("singleFile");
     var multipleFilesInput = document.getElementById("multipleFiles");
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test.html
index 5b9ea13..2163898 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test.html
@@ -8,8 +8,8 @@ To manually test this, click on the black region below.</p>
 </div>
 <script>
 
-if (window.layoutTestController && window.eventSender) {
-    layoutTestController.dumpAsText();
+if (window.testRunner && window.eventSender) {
+    testRunner.dumpAsText();
 
     eventSender.mouseMoveTo(180, 50);
     eventSender.leapForward(200);
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/file-input-pressed-state.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-pressed-state.html
index 25f69e7..44d3b2b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/file-input-pressed-state.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-pressed-state.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText(true); // Dump pixel test result.
+if (window.testRunner)
+    testRunner.dumpAsText(true); // Dump pixel test result.
 </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset.html
index a15edfb..9d7cca1 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset.html
@@ -15,7 +15,7 @@ To run this test manually, choose a file and then click the reset button.
 If the label next to the file chooser button changes to "No file chosen", the test passes.
 </p>
 <script>
-if (layoutTestController && eventSender) {
+if (testRunner && eventSender) {
     var file = document.getElementById("file");
     var reset = document.getElementById("reset");
     dragFilesOntoElement(file, ["foo.txt"]);
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload.html b/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload.html
index 83e59cb..aa54a49 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload.html
@@ -22,8 +22,8 @@ function startOrVerify()
             log('PASS: ' + query);
         else
             log('FAIL: ' + query);
-        layoutTestController.dumpAsText();
-        layoutTestController.notifyDone();
+        testRunner.dumpAsText();
+        testRunner.notifyDone();
     } else {
         // Start the test
         eventSender.beginDragWithFiles(['get-file-upload.html']);
@@ -34,7 +34,7 @@ function startOrVerify()
 }
 
 if (window.eventSender) {
-    layoutTestController.waitUntilDone();
+    testRunner.waitUntilDone();
     window.onload = startOrVerify;
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload.html
index 683ded3..7f7af0d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload.html
@@ -52,8 +52,8 @@ function onInputFileChange(currentFileList, lastTest)
             log("PASS: name is " + files[i].name + "; path is " + files[i].webkitRelativePath);
     }
 
-   if (lastTest && layoutTestController)
-        layoutTestController.notifyDone();
+   if (lastTest && testRunner)
+        testRunner.notifyDone();
    else
         log("");
 }
@@ -68,9 +68,9 @@ function doTest(fileList, last)
     eventSender.mouseUp();
 }
 
-if (layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (window.eventSender) {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-entries.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-entries.html
index 961c98f..1df0f1b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-entries.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-entries.html
@@ -34,8 +34,8 @@ var expectedFileAttributes = {
 var droppedEntries, verifyingEntry, returnedMetadata, returnedEntries;
 
 var jsTestIsAsync = true;
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
     doTest(0);
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label.html
index 28c908f..bc42986 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label.html
@@ -10,7 +10,7 @@
 <p>This tests the label of a file chooser button.</p>
 <div id="console"></div>
 <script>
-if (window.layoutTestController) {
+if (window.testRunner) {
     var file = document.getElementById('single_file');
     var button = internals.shadowRoot(file).firstChild;
     var label = button.getAttribute('value');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture.html
index 27cdec2..10341aa 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture.html
@@ -2,9 +2,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 const INITIAL= 0;
 const OPEN_FILE_WITHOUT_GESTURE = 1;
@@ -38,12 +38,12 @@ function openFileDialogWithoutUserGesture() {
         clickFired = true;
         testStage = OPEN_FILE_WITHOUT_GESTURE;
         // Waits for opening the file dialog and checks whether the click event can still be received by document.
-        setTimeout("checkResult(function() { layoutTestController.notifyDone(); })", 500);
+        setTimeout("checkResult(function() { testRunner.notifyDone(); })", 500);
     }, 1);
 }
 
 function startTest() {
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
     document.body.addEventListener("click", function() { window.clickReceived = true }, true);
     setTimeout(openFileDialogWithoutUserGesture, 1);
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-re-render.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-re-render.html
index 24de2b3..d11ea8e 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-re-render.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-re-render.html
@@ -23,12 +23,12 @@ function startTest()
     // Attach a renderer again.
     input.style.display = 'inline-block';
 
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 
 if (window.eventSender) {
     window.onload = startTest;
-    layoutTestController.waitUntilDone();
+    testRunner.waitUntilDone();
 }
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-write-files.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-write-files.html
index 760c7b8..0d5e54c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/input-file-write-files.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-write-files.html
@@ -23,8 +23,8 @@ function onInputFileChange()
 
     doStringTest();
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function handleDragOver(e) {
@@ -71,9 +71,9 @@ function doStringTest()
         log("FAIL: writing empty string to value did not clear files");
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (window.eventSender) {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/recover-file-input-in-unposted-form.html b/third_party/WebKit/LayoutTests/fast/forms/file/recover-file-input-in-unposted-form.html
index a6e8546..f5da4f0 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file/recover-file-input-in-unposted-form.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/recover-file-input-in-unposted-form.html
@@ -33,7 +33,7 @@ description("Test that the state of a file chooser is recovered when navigating
 // - Check the form data.
 
 function test() {
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
     if (document.location.search == "" && window.name == "") {
         // Start of the test. Set the values to the input elements.
diff --git a/third_party/WebKit/LayoutTests/fast/forms/focus-change-on-keypress.html b/third_party/WebKit/LayoutTests/fast/forms/focus-change-on-keypress.html
index cfcd33e..4b124ef 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/focus-change-on-keypress.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/focus-change-on-keypress.html
@@ -42,8 +42,8 @@ function runTest(name, shouldChangeSelection) {
     document.writeln();
 }
 
-if (window.layoutTestController && window.eventSender) {
-    layoutTestController.dumpAsText();
+if (window.testRunner && window.eventSender) {
+    testRunner.dumpAsText();
 
     runTest('input', false);
     runTest('input', true);
diff --git a/third_party/WebKit/LayoutTests/fast/forms/focus-control-to-page.html b/third_party/WebKit/LayoutTests/fast/forms/focus-control-to-page.html
index 78f8c77..6014026 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/focus-control-to-page.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/focus-control-to-page.html
@@ -8,8 +8,8 @@ function log(str)
 
 function runTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     if (!window.eventSender)
         return;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/focus-selection-input.html b/third_party/WebKit/LayoutTests/fast/forms/focus-selection-input.html
index 3a91515..dc28b49 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/focus-selection-input.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/focus-selection-input.html
@@ -4,15 +4,15 @@
 <script>
 function runTest()
 {
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
 
     var accessKeyModifiers = ["altKey"];
     if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
         accessKeyModifiers = ["ctrlKey", "altKey"];
 
-    layoutTestController.dumpEditingCallbacks();
-    layoutTestController.dumpAsText();
+    testRunner.dumpEditingCallbacks();
+    testRunner.dumpAsText();
 
     shouldBe("first.selectionStart", "12");
     shouldBe("first.selectionEnd", "19");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/focus-selection-textarea.html b/third_party/WebKit/LayoutTests/fast/forms/focus-selection-textarea.html
index 4cf9d1f..35cbe8f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/focus-selection-textarea.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/focus-selection-textarea.html
@@ -4,15 +4,15 @@
 <script>
 function runTest()
 {
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
 
     var accessKeyModifiers = ["altKey"];
     if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
         accessKeyModifiers = ["ctrlKey", "altKey"];
 
-    layoutTestController.dumpEditingCallbacks();
-    layoutTestController.dumpAsText();
+    testRunner.dumpEditingCallbacks();
+    testRunner.dumpAsText();
 
     shouldBe("first.selectionStart", "11");
     shouldBe("first.selectionEnd", "18");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/focus-style-pending.html b/third_party/WebKit/LayoutTests/fast/forms/focus-style-pending.html
index 97b99c8..7264322 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/focus-style-pending.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/focus-style-pending.html
@@ -1,8 +1,8 @@
 <html>
 <link rel=stylesheet href="data:text/css,bogus{}">
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 <body>
 Test that focus() sets input focus correctly even when there are pending stylesheet loads.<br>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/focus-with-display-block.html b/third_party/WebKit/LayoutTests/fast/forms/focus-with-display-block.html
index 0d6d952..e491dab 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/focus-with-display-block.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/focus-with-display-block.html
@@ -15,7 +15,7 @@ output, meter, progress {
 description('This test ensures that &lt;output&gt;, &lt;meter&gt; and &lt;progress&gt; are not focused.');
 
 function moveFocus(element) {
-    if (window.layoutTestController)
+    if (window.testRunner)
         eventSender.keyDown('\t');
     else
         element.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/focus.html b/third_party/WebKit/LayoutTests/fast/forms/focus.html
index c777fd5..79cdc15 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/focus.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/focus.html
@@ -9,8 +9,8 @@ function log(message)
 }
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     document.getElementById("1").focus();
     document.getElementById("2").focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/focus2.html b/third_party/WebKit/LayoutTests/fast/forms/focus2.html
index 7664654..81ef694 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/focus2.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/focus2.html
@@ -6,8 +6,8 @@
 
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(s)
 {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-action.html b/third_party/WebKit/LayoutTests/fast/forms/form-action.html
index ea5e51b..3141afd 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-action.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-action.html
@@ -1,8 +1,8 @@
 <html>
 <body>
 <script>
- if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+ if (window.testRunner)
+    testRunner.dumpAsText();
 
 function test(ul) {
 ul.document.getElementById('sourceViewDiv').innerHTML=' This test: PASSED!'
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash.html b/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash.html
index 80aae53..9418632 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (!window.gc) {
@@ -31,8 +31,8 @@ function delay() {
     var form = document.createElement('form');
     form.setAttribute('id', 'form2');
     document.body.appendChild(form);
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash2.html b/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash2.html
index 2030306..39d310a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash2.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash2.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function gc() {
@@ -34,8 +34,8 @@ function delay()
     form.setAttribute('id', 'form2');
     document.body.appendChild(form);
     location.reload();
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash3.html b/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash3.html
index 033ffff6..d9fc086 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash3.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-associated-element-crash3.html
@@ -1,7 +1,7 @@
 <body>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 This test passes if it doesn't crash.  Note: You might need to reload this test
 many times (or run the test under valgrind / ASAN) to see a crash.
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-attribute-elements.html b/third_party/WebKit/LayoutTests/fast/forms/form-attribute-elements.html
index 7523b43..37629ea 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-attribute-elements.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-attribute-elements.html
@@ -9,8 +9,8 @@
 <script>
 description("This test checks a form element can handle elements of which form attribute points the form element even if elements are outside of the form.");
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 var container = document.createElement('div');
 document.body.appendChild(container);
@@ -44,8 +44,8 @@ if (query.indexOf('submitted=true') == -1) {
     shouldBeEqualToString('pairs[0]', 'key1=value1');
     shouldBeEqualToString('pairs[1]', 'key2=value2');
     shouldBeEqualToString('pairs[2]', 'submitted=true');
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 <script src="../../fast/js/resources/js-test-post.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-collection-lookup.html b/third_party/WebKit/LayoutTests/fast/forms/form-collection-lookup.html
index 7b4a24a..735067c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-collection-lookup.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-collection-lookup.html
@@ -1,8 +1,8 @@
 <body onload="runTest()">
 <script>
 function runTest() {
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
 }
 var form = document.createElement('form');
 var input = document.createElement('input');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-control-element-crash.html b/third_party/WebKit/LayoutTests/fast/forms/form-control-element-crash.html
index d578698..0a513f1 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-control-element-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-control-element-crash.html
@@ -1,7 +1,7 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 if (window.eventSender) {
     // Repeat to increase chance of crash.
@@ -10,7 +10,7 @@ if (window.eventSender) {
             eventSender.mouseMoveTo(75,75);
         }, 0);
     }
-    setTimeout(function() { if (window.layoutTestController) { layoutTestController.notifyDone(); } }, 0);
+    setTimeout(function() { if (window.testRunner) { testRunner.notifyDone(); } }, 0);
 }
 </script>
 Generated by cluster-fuzz. This test passes if it doesn't crash.
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding-2.html b/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding-2.html
index ba7a8ad..3badbb0 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding-2.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding-2.html
@@ -8,9 +8,9 @@
  <input type=hidden name=q value="&#1105;&#66560;&#119083;çc"><br>
 </form>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.URL.substring(0, 4) == "file") {
@@ -25,8 +25,8 @@ if (document.URL.substring(0, 4) == "file") {
         else
             document.write("<p>Failure</p>");
         
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding-normalization-overrun.html b/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding-normalization-overrun.html
index 2a1f1e016..0bd974d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding-normalization-overrun.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding-normalization-overrun.html
@@ -11,9 +11,9 @@ REGRESSION: Reproducible crash at Wikipedia</p>
  <input type=hidden name=q value="&#x65;&#x301;"><br>
 </form>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.URL.substring(0, 4) == "file") {
@@ -28,8 +28,8 @@ if (document.URL.substring(0, 4) == "file") {
         <!-- no crash == success -->
         document.write("<p>SUCCESS</p>");
         
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding.html b/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding.html
index 92133cd..4037581 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-data-encoding.html
@@ -8,9 +8,9 @@
  <input type=hidden name=q value="&#1105;&#66560;&#119083;çc"><br>
 </form>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.URL.substring(0, 4) == "file") {
@@ -25,8 +25,8 @@ if (document.URL.substring(0, 4) == "file") {
         else
             document.write("<p>Failure, query is " + document.URL.substring(document.URL.indexOf('?')+1, document.URL.length) + "</p>");
         
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart.html b/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart.html
index 8005ae6..a7ad7e4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart.html
@@ -9,9 +9,9 @@
                         <input type="submit" value="press me">
                 </form>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.URL.substring(0, 4) == "file") {
@@ -27,8 +27,8 @@ if (document.URL.substring(0, 4) == "file") {
         else
             document.write("<p>Failure</p>");
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart2.html b/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart2.html
index d66fbf0..8758392 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart2.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart2.html
@@ -9,9 +9,9 @@
                         <input type="submit" value="press me">
                 </form>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.URL.substring(0, 4) == "file") {
@@ -27,8 +27,8 @@ if (document.URL.substring(0, 4) == "file") {
         else
             document.write("<p>Failure</p>");
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart3.html b/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart3.html
index 02d78d7c0..abcd177 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart3.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-get-multipart3.html
@@ -9,9 +9,9 @@
                         <input type="submit" value="press me">
                 </form>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.URL.substring(0, 4) == "file") {
@@ -27,8 +27,8 @@ if (document.URL.substring(0, 4) == "file") {
         else
             document.write("<p>Failure</p>");
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-get-textplain.html b/third_party/WebKit/LayoutTests/fast/forms/form-get-textplain.html
index c46e366..24cc4af 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-get-textplain.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-get-textplain.html
@@ -10,9 +10,9 @@
     <input type="submit" value="press me">
 </form>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.URL.substring(0, 4) == "file") {
@@ -29,8 +29,8 @@ if (document.URL.substring(0, 4) == "file") {
         else
             document.write("<p>Failure: (" + document.URL + ")</p>");
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-post-urlencoded.html b/third_party/WebKit/LayoutTests/fast/forms/form-post-urlencoded.html
index 819bf26..0b17fac 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-post-urlencoded.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-post-urlencoded.html
@@ -9,9 +9,9 @@
                         <input type="submit" value="press me">
                 </form>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.URL.substring(0, 4) == "file") {
@@ -27,8 +27,8 @@ if (document.URL.substring(0, 4) == "file") {
         else
             document.write("<p>Failure</p>");
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/form-submission-create-crash.xhtml b/third_party/WebKit/LayoutTests/fast/forms/form-submission-create-crash.xhtml
index 5947a2f..c0d6b8d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/form-submission-create-crash.xhtml
+++ b/third_party/WebKit/LayoutTests/fast/forms/form-submission-create-crash.xhtml
@@ -4,9 +4,9 @@ Test passes if it does not crash.
 <input id="submit" type="submit" />
 </form>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 textNode = document.createTextNode("x");
@@ -16,8 +16,8 @@ runTest = function() {
     event = document.createEvent("MouseEvent");
     event.initEvent("click");
     textNode.dispatchEvent(event);
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 setTimeout(runTest, 0);
diff --git a/third_party/WebKit/LayoutTests/fast/forms/formmethod-attribute-button-html.html b/third_party/WebKit/LayoutTests/fast/forms/formmethod-attribute-button-html.html
index 9204971..fd39fb2 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/formmethod-attribute-button-html.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/formmethod-attribute-button-html.html
@@ -12,8 +12,8 @@
 </form>
 <script>
 description("Test for the formmethod attribute in button tags.");
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
 }
 
 var button = document.getElementById('button');
@@ -27,8 +27,8 @@ if (document.URL.substring(0, 4) == "file") {
         else
             testFailed('The formmethod attribute was not used');
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/formmethod-attribute-input-html.html b/third_party/WebKit/LayoutTests/fast/forms/formmethod-attribute-input-html.html
index 5e022da..38584b3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/formmethod-attribute-input-html.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/formmethod-attribute-input-html.html
@@ -12,8 +12,8 @@
 </form>
 <script>
 description("Test for the formmethod attribute in input tags.");
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
 }
 
 var button = document.getElementById('button');
@@ -27,8 +27,8 @@ if (document.URL.substring(0, 4) == "file") {
         else
             testFailed('The formmethod attribute was not used');
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/formtarget-attribute-button-html.html b/third_party/WebKit/LayoutTests/fast/forms/formtarget-attribute-button-html.html
index 4b889cd..43ae590 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/formtarget-attribute-button-html.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/formtarget-attribute-button-html.html
@@ -12,9 +12,9 @@ description("Test for the formtarget attribute in a button tag.");
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.setAllowUniversalAccessFromFileURLs(true);
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.setAllowUniversalAccessFromFileURLs(true);
+        testRunner.waitUntilDone();
     }
 
     // Not dumping as text since the DumpRenderTree does not dump the text content of child frames.                
@@ -28,8 +28,8 @@ function passFrameLoaded()
         return;
     testPassed("The formtarget attribute was successfully used.");
     isSuccessfullyParsed();
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function failFrameLoaded()
@@ -38,8 +38,8 @@ function failFrameLoaded()
         return;
     testFailed("The formtarget attribute was not used.");
     isSuccessfullyParsed();
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 <iframe src="about:blank" id="pass" name="passFrame" onload="passFrameLoaded()"></iframe>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/formtarget-attribute-input-html.html b/third_party/WebKit/LayoutTests/fast/forms/formtarget-attribute-input-html.html
index ff1bced..23987de 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/formtarget-attribute-input-html.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/formtarget-attribute-input-html.html
@@ -12,9 +12,9 @@ description("Test for the formtarget attribute in an input tag.");
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.setAllowUniversalAccessFromFileURLs(true);
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.setAllowUniversalAccessFromFileURLs(true);
+        testRunner.waitUntilDone();
     }
 
     // Not dumping as text since the DumpRenderTree does not dump the text content of child frames.                
@@ -28,8 +28,8 @@ function passFrameLoaded()
         return;
     testPassed("The formtarget attribute was successfully used.");
     isSuccessfullyParsed();
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function failFrameLoaded()
@@ -38,8 +38,8 @@ function failFrameLoaded()
         return;
     testFailed("The formtarget attribute was not used.");
     isSuccessfullyParsed();
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 <iframe src="about:blank" id="pass" name="passFrame" onload="passFrameLoaded()"></iframe>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/get-forms-to-about-blank.html b/third_party/WebKit/LayoutTests/fast/forms/get-forms-to-about-blank.html
index 2da9f0a..609224d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/get-forms-to-about-blank.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/get-forms-to-about-blank.html
@@ -5,9 +5,9 @@
     <script>
 
 function run() {
-    if (window.layoutTestController) {
-        window.layoutTestController.dumpAsText();
-        window.layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        window.testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
     }
 
     description('Submitting a GET form to &lt;about:blank&gt; should redirect the browser to &lt;about:blank?&gt;.');
@@ -27,8 +27,8 @@ function onFrameLoad()
 
     shouldBe('iframe.contentDocument.URL', '"about:blank?"');
     isSuccessfullyParsed();
-    if (window.layoutTestController)
-        window.layoutTestController.notifyDone();
+    if (window.testRunner)
+        window.testRunner.notifyDone();
 }
     </script>
   </head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/hidden-input-enabled.html b/third_party/WebKit/LayoutTests/fast/forms/hidden-input-enabled.html
index b18b8ae..3e9fb19 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/hidden-input-enabled.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/hidden-input-enabled.html
@@ -1,7 +1,7 @@
 <head>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 
 <style>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/hidden-listbox.html b/third_party/WebKit/LayoutTests/fast/forms/hidden-listbox.html
index 7918ad8..aeac2f6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/hidden-listbox.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/hidden-listbox.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.display();
+if (window.testRunner)
+    testRunner.display();
 </script>
 This tests that the whole listbox control is hidden when visibility is set to hidden.
 <br>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/implicit-submission.html b/third_party/WebKit/LayoutTests/fast/forms/implicit-submission.html
index 612da78..af3286f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/implicit-submission.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/implicit-submission.html
@@ -36,9 +36,9 @@ var allTests = [
     [ "Multiple text inputs with a disabled button", "!text,text,-button", "n"]
 ];
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var results = {
@@ -74,8 +74,8 @@ function runNextTest()
     }
     document.getElementById('arena').textContent = '';
     results.publish();
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function buildAndTestForm(arena, inputs, description)
diff --git a/third_party/WebKit/LayoutTests/fast/forms/inline-ignored-on-legend.html b/third_party/WebKit/LayoutTests/fast/forms/inline-ignored-on-legend.html
index 4dfbf93..48d805c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/inline-ignored-on-legend.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/inline-ignored-on-legend.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 	<script>
-	    if (window.layoutTestController) {
-	        layoutTestController.dumpAsText();
+	    if (window.testRunner) {
+	        testRunner.dumpAsText();
 	    }
 	</script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-appearance-elementFromPoint.html b/third_party/WebKit/LayoutTests/fast/forms/input-appearance-elementFromPoint.html
index 7bc9c99..9b13dce5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-appearance-elementFromPoint.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-appearance-elementFromPoint.html
@@ -2,8 +2,8 @@
 <head>
 <script>
 function showElement(x, y) {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
         
     var result = document.getElementById('res');
     var myElement = document.elementFromPoint(x, y);
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-appearance-preventDefault.html b/third_party/WebKit/LayoutTests/fast/forms/input-appearance-preventDefault.html
index e30a448..8f03f32 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-appearance-preventDefault.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-appearance-preventDefault.html
@@ -3,7 +3,7 @@
 <script>
 function test()
 {    
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         eventSender.mouseMoveTo(25, 55);
         eventSender.mouseDown();
         eventSender.mouseUp();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-autofilled.html b/third_party/WebKit/LayoutTests/fast/forms/input-autofilled.html
index 61ae360..38150ac 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-autofilled.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-autofilled.html
@@ -3,8 +3,8 @@
     <script src="../js/resources/js-test-pre.js"></script>
     <script>
     function test() {
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
         }
 
         var tf = document.getElementById('tf');
@@ -12,8 +12,8 @@
         var originalForeground = computedStyle.color;
         var originalBackground = computedStyle.backgroundColor;
 
-        if (window.layoutTestController) {
-            layoutTestController.setAutofilled(tf, true);
+        if (window.testRunner) {
+            testRunner.setAutofilled(tf, true);
         }
 
         // Both the foreground and background colors should change.
@@ -29,8 +29,8 @@
             return;
         }
 
-        if (window.layoutTestController) {
-            layoutTestController.setAutofilled(tf, false);
+        if (window.testRunner) {
+            testRunner.setAutofilled(tf, false);
         }
 
         // Colors should be restored.
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-changing-value.html b/third_party/WebKit/LayoutTests/fast/forms/input-changing-value.html
index 956e9d7..ee75a82 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-changing-value.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-changing-value.html
@@ -6,8 +6,8 @@ function test()
 {
     document.getElementById('sp').focus();
     
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
     }
     
     document.execCommand("InsertText", false, 'Test');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-delete.html b/third_party/WebKit/LayoutTests/fast/forms/input-delete.html
index 6747460..579ef8d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-delete.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-delete.html
@@ -3,8 +3,8 @@
 <script src="../../editing/editing.js" language="JavaScript" type="text/JavaScript" ></script>
 <script>
 function test() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
     }
     document.getElementById('tf').setSelectionRange(5, 11);
     deleteCommand();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-element-attach-crash.html b/third_party/WebKit/LayoutTests/fast/forms/input-element-attach-crash.html
index 318731b..a4f4561 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-element-attach-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-element-attach-crash.html
@@ -1,8 +1,8 @@
 <html>
     <head>
         <script>
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
         </script>
     </head>
     <body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-first-letter-edit.html b/third_party/WebKit/LayoutTests/fast/forms/input-first-letter-edit.html
index e855c41..bcbccdd 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-first-letter-edit.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-first-letter-edit.html
@@ -7,8 +7,8 @@ input:first-letter {
 }
 </style>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 function test()
 {
     var target = document.getElementById("target");
@@ -20,7 +20,7 @@ function test()
         eventSender.keyDown("l");
         eventSender.keyDown("o");
         document.execCommand("selectAll"); // Does selectAll for aligning the @autofocus attribute on the expectation.
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     }
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-hit-test-border.html b/third_party/WebKit/LayoutTests/fast/forms/input-hit-test-border.html
index ce35426..dff6c82 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-hit-test-border.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-hit-test-border.html
@@ -2,8 +2,8 @@
 <head>
 <script>
 function runTest() {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
         
     var result = document.getElementById('res');
     var input = document.getElementById('tf');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-image-submit.html b/third_party/WebKit/LayoutTests/fast/forms/input-image-submit.html
index 4736c05..c71a1b6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-image-submit.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-image-submit.html
@@ -13,8 +13,8 @@
 <div id="console"></div>
 <script>
 function notifyDone() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function failAndDone(message) {
@@ -41,8 +41,8 @@ function handleClick() {
     }
 }
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 var state = document.getElementById('state');
 var image = document.getElementById('image');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-implicit-length-limit.html b/third_party/WebKit/LayoutTests/fast/forms/input-implicit-length-limit.html
index 4470761..056bb4f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-implicit-length-limit.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-implicit-length-limit.html
@@ -7,8 +7,8 @@
         document.getElementById("log").appendChild(document.createTextNode(msg + "\n"));
     }
 
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var testString = "";
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-multiple.html b/third_party/WebKit/LayoutTests/fast/forms/input-multiple.html
index e2231c2..e6d924b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-multiple.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-multiple.html
@@ -18,8 +18,8 @@
         
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
             
             var up1 = document.getElementById("up1");
             var up2 = document.getElementById("up2");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-named-action-overrides-action-attribute.html b/third_party/WebKit/LayoutTests/fast/forms/input-named-action-overrides-action-attribute.html
index c31c7e2..4536266 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-named-action-overrides-action-attribute.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-named-action-overrides-action-attribute.html
@@ -7,8 +7,8 @@
 <p id="result"></p>
 <script>
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
         document.forms[0].action.value = "Passed";
         document.getElementById("result").innerText = "Test " + (document.forms[0].action.value ? document.forms[0].action.value : "Failed");
     }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-placeholder-paint-order.html b/third_party/WebKit/LayoutTests/fast/forms/input-placeholder-paint-order.html
index be5fb3e..6106ea4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-placeholder-paint-order.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-placeholder-paint-order.html
@@ -2,8 +2,8 @@
 <body>
 <script>
 // We don't care a render tree of this test.
-if (window.layoutTestController)
-    layoutTestController.dumpAsText(true);
+if (window.testRunner)
+    testRunner.dumpAsText(true);
 </script>
 <style>
 input {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-readonly-autoscroll.html b/third_party/WebKit/LayoutTests/fast/forms/input-readonly-autoscroll.html
index 5a447dc..bc8634c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-readonly-autoscroll.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-readonly-autoscroll.html
@@ -3,8 +3,8 @@
         <script>
             function test()
             {
-                if (window.layoutTestController) {
-                    layoutTestController.waitUntilDone();
+                if (window.testRunner) {
+                    testRunner.waitUntilDone();
                     setTimeout(autoscrollTestPart1, 0);
                 }
             }
@@ -27,8 +27,8 @@
                 if (window.eventSender)
                     eventSender.mouseUp();
                 log("ScrollLeft: " + document.getElementById('tf').scrollLeft);
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
             function log(msg)
             {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-readonly-focus.html b/third_party/WebKit/LayoutTests/fast/forms/input-readonly-focus.html
index 7a9be65..b77e6c4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-readonly-focus.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-readonly-focus.html
@@ -2,7 +2,7 @@
 <head>
 <script>
 function runTest() {
-  window.layoutTestController.dumpAsText();
+  window.testRunner.dumpAsText();
 
   var input = document.getElementById('i');
   eventSender.mouseMoveTo(input.offsetLeft + input.offsetWidth / 2, input.offsetTop + input.offsetHeight / 2);
@@ -14,7 +14,7 @@ window.onload = function() {
   input.onfocus = function(e) {
     document.body.innerHTML = 'PASS';
   }
-  if (window.layoutTestController)
+  if (window.testRunner)
     runTest();
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-search-press-escape-key.html b/third_party/WebKit/LayoutTests/fast/forms/input-search-press-escape-key.html
index fa398be..2cc00e0 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-search-press-escape-key.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-search-press-escape-key.html
@@ -17,7 +17,7 @@ description("This tests if the value in a search input form is cleared and a 'se
             "To run (a part of) this test manually, type some text in the search form and then press the Escape key. " +
             "If the text is cleared, then the test passes.");
 
-if (window.layoutTestController && window.eventSender) {
+if (window.testRunner && window.eventSender) {
     var input = $("search");
     var enabled = false;
     var disabled = true;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-select-on-click.html b/third_party/WebKit/LayoutTests/fast/forms/input-select-on-click.html
index 299617f..2c60223 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-select-on-click.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-select-on-click.html
@@ -2,8 +2,8 @@
 <head>
 <script>
 function test() {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var tf = document.getElementById('tf');
     var x = tf.offsetLeft + tf.offsetWidth / 2;
     var y = tf.offsetTop + tf.offsetHeight / 2;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-select-webkit-user-select-none.html b/third_party/WebKit/LayoutTests/fast/forms/input-select-webkit-user-select-none.html
index 0b75874..4859ec9 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-select-webkit-user-select-none.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-select-webkit-user-select-none.html
@@ -2,8 +2,8 @@
 <head>
 <script>
 function test() {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var tf = document.getElementById('tf');
     tf.select();
     if (tf.selectionStart == 0 && tf.selectionEnd == 0) { // ;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-selection-hidden.html b/third_party/WebKit/LayoutTests/fast/forms/input-selection-hidden.html
index b5640b2..52d065b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-selection-hidden.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-selection-hidden.html
@@ -6,8 +6,8 @@ function log(msg) {
 }
     
 function test () {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var tf = document.getElementById('tf');
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-setvalue-selection.html b/third_party/WebKit/LayoutTests/fast/forms/input-setvalue-selection.html
index 4c1352f..6ae0547 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-setvalue-selection.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-setvalue-selection.html
@@ -7,8 +7,8 @@ JavaScript Form Validation issue on Banco do Brasil site.</p>
 </form>
 
 <script>
-  if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+  if (window.testRunner)
+    testRunner.dumpAsText();
 
   input = document.getElementsByTagName("input")[0];
   input.value = "1";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-text-enter.html b/third_party/WebKit/LayoutTests/fast/forms/input-text-enter.html
index 10a1c00..ff9f8c0 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-text-enter.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-text-enter.html
@@ -2,8 +2,8 @@
 <p><input id="input" value="12345678"></input></p>
 <p>Content of input after pressing return is "<span id="result"></span>". It should be "12345678".</p>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 var input = document.getElementById("input");
 input.setSelectionRange(2, 6);
 var event = document.createEvent("KeyboardEvents");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-type-change-in-onfocus-keyboard.html b/third_party/WebKit/LayoutTests/fast/forms/input-type-change-in-onfocus-keyboard.html
index bc69f3d..457dc73 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-type-change-in-onfocus-keyboard.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-type-change-in-onfocus-keyboard.html
@@ -2,8 +2,8 @@
 <head>
     <script>
     function runTest() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
         else {
             alert('This test does not work in Safari.');
             return;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-type-change-in-onfocus-mouse.html b/third_party/WebKit/LayoutTests/fast/forms/input-type-change-in-onfocus-mouse.html
index f22c642..b574547 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-type-change-in-onfocus-mouse.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-type-change-in-onfocus-mouse.html
@@ -2,8 +2,8 @@
 <head>
     <script>
     function runTest() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
         else {
             alert('This test does not work in Safari.');
             return;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-zero-height-focus.html b/third_party/WebKit/LayoutTests/fast/forms/input-zero-height-focus.html
index 202208a..7bf6726 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-zero-height-focus.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/input-zero-height-focus.html
@@ -7,7 +7,7 @@
 </p>
 <textarea id="target" style="height: 0"></textarea>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     document.getElementById("target").focus();
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-attach-assertion.html b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-attach-assertion.html
index e3cc2a9..f0c4a6f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-attach-assertion.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-attach-assertion.html
@@ -15,13 +15,13 @@
 <script>
 function check() {
     testPassed('Not crashed.');
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
     setTimeout(check, 10);
     document.getElementsByTagName('input')[1].click();
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-cancel.html b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-cancel.html
index 1f45054..b4077cb 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-cancel.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-cancel.html
@@ -30,12 +30,12 @@ function startOrVerify() {
         testPassed('The form was not submitted.');
     }
     debug('TEST COMPLETE');
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 window.onload = startOrVerify;
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-formnovalidate.html b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-formnovalidate.html
index d633331..0f26e43 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-formnovalidate.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-formnovalidate.html
@@ -20,8 +20,8 @@ function startOrVerify() {
         testPassed('The form should not be submitted.');
         shouldBeTrue('location.search.indexOf("i0=") != -1');
         debug('TEST COMPLETE');
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     } else {
         // HTMLFormElement::submit() skips validation. Use the submit button.
         document.getElementById('s').click();
@@ -29,8 +29,8 @@ function startOrVerify() {
     }
 }
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 window.onload = startOrVerify;
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-novalidate.html b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-novalidate.html
index 2c6786c..34704e4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-novalidate.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-novalidate.html
@@ -20,8 +20,8 @@ function startOrVerify() {
         testPassed('The form should not be submitted.');
         shouldBeTrue('location.search.indexOf("i0=") != -1');
         debug('TEST COMPLETE');
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     } else {
         // HTMLFormElement::submit() skips validation. Use the submit button.
         document.getElementById('s').click();
@@ -29,8 +29,8 @@ function startOrVerify() {
     }
 }
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 window.onload = startOrVerify;
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-prevented.html b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-prevented.html
index d02d52e..1878019 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-prevented.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-prevented.html
@@ -30,12 +30,12 @@ function startOrVerify() {
         debug('TEST COMPLETE');
     }
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 window.onload = startOrVerify;
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-remove-node-in-handler.html b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-remove-node-in-handler.html
index 4061bb0..18fe48f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-remove-node-in-handler.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-remove-node-in-handler.html
@@ -26,8 +26,8 @@ function startOrVerify() {
     if (query.indexOf('submitted=true') != -1) {
         testPassed('The form was submitted.');
         debug('TEST COMPLETE');
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     } else {
         // HTMLFormElement::submit() skips validation. Use the submit button.
         document.getElementById('s').click();
@@ -36,8 +36,8 @@ function startOrVerify() {
     }
 }
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 window.onload = startOrVerify;
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-required-checkbox.html b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-required-checkbox.html
index 1f84daa..d3f730c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-required-checkbox.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/interactive-validation-required-checkbox.html
@@ -20,8 +20,8 @@ function startOrVerify() {
         testPassed('The form should be submitted.');
         shouldBeTrue('location.search.indexOf("terms=on") != -1');
         debug('TEST COMPLETE');
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     } else {
         document.getElementById('i0').checked = true;
         // HTMLFormElement::submit() skips validation. Use the submit button.
@@ -30,8 +30,8 @@ function startOrVerify() {
     }
 }
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 window.onload = startOrVerify;
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/large-parts.html b/third_party/WebKit/LayoutTests/fast/forms/large-parts.html
index bedf508..0153b76 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/large-parts.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/large-parts.html
@@ -3,8 +3,8 @@
   <title>Test for Bug 41737. PASS unless crash.</title>
 </head>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 <body>
 <p>Test for Bug 41737. PASS unless crash.</p>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/legend-access-key.html b/third_party/WebKit/LayoutTests/fast/forms/legend-access-key.html
index fd4301a..8fea663 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/legend-access-key.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/legend-access-key.html
@@ -9,8 +9,8 @@ function log(message)
 }
 function test()
 {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
 
         if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
             modifiers = ["ctrlKey", "altKey"];
diff --git a/third_party/WebKit/LayoutTests/fast/forms/legend-display-none.html b/third_party/WebKit/LayoutTests/fast/forms/legend-display-none.html
index 278aaf6..a913f01 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/legend-display-none.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/legend-display-none.html
@@ -7,8 +7,8 @@
     <legend id="target" style="display: none;">Legendary</legend>
 </fieldset>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     document.body.offsetTop;
     display = getComputedStyle(document.getElementById("target")).display;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-clear-restore.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-clear-restore.html
index 554c49c..885da54 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-clear-restore.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-clear-restore.html
@@ -28,8 +28,8 @@ function clearList()
 
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
     populateList();
     document.getElementById("myList").selectedIndex = 19;
@@ -38,8 +38,8 @@ function test()
     document.body.offsetWidth; // Force a layout.
     populateList();
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-clip.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-clip.html
index 480620d..f4b72c9 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-clip.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-clip.html
@@ -11,8 +11,8 @@
     <option>aaaaaa</option>
     </select>
     <script>
-        if (window.layoutTestController)
-            layoutTestController.display();
+        if (window.testRunner)
+            testRunner.display();
     </script>
 </body>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-onchange.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-onchange.html
index f682073..34f7fc00 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-onchange.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-onchange.html
@@ -18,9 +18,9 @@
             {
                 setup();
                 
-                if (window.layoutTestController) {
-                    layoutTestController.dumpAsText();
-                    layoutTestController.waitUntilDone();
+                if (window.testRunner) {
+                    testRunner.dumpAsText();
+                    testRunner.waitUntilDone();
                 }
 
                 checkSelection("0");
@@ -116,8 +116,8 @@
                 document.getElementById("sl1").blur();
                 checkSelection("4");
 
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
             
             function mouseDownOnSelect(selId, index, shift, metaOrCtrl)
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-scroll-after-options-removed.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-scroll-after-options-removed.html
index 0953f3c..c1f6031 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-scroll-after-options-removed.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-scroll-after-options-removed.html
@@ -3,9 +3,9 @@
         <script>
         function test()
         {
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
             }
 
             setTimeout(test2, 0);
@@ -27,8 +27,8 @@
             else
                 log("Test Failed.  scrollTop = " + scrollTop + " even though there is only one option in the listbox");
             
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
+            if (window.testRunner)
+                testRunner.notifyDone();
         }
         
         function log(msg)
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-select-all.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-select-all.html
index 29ed52b..87fdb1e 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-select-all.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-select-all.html
@@ -19,8 +19,8 @@
 
                 sl.multiple = false;
                 
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
             }
             
             function log(msg) {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-cyrillic.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-cyrillic.html
index 3b877e6..03907bc 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-cyrillic.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-cyrillic.html
@@ -49,8 +49,8 @@ function log(str) {
     console.appendChild(li);
 }
 
-if (window.layoutTestController)
-    window.layoutTestController.dumpAsText();
+if (window.testRunner)
+    window.testRunner.dumpAsText();
 
 // Set the input focus to the <select> element.
 var node = document.getElementById("test");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-empty.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-empty.html
index 0b2f02c..fff9235 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-empty.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-empty.html
@@ -5,8 +5,8 @@
 </select>
 <div id="result">Cannot run interactively.</div>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
         var list = document.getElementById("list");
         list.focus();
         eventSender.keyDown("z");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-greek.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-greek.html
index 4927d72..4e0ae27 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-greek.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-greek.html
@@ -41,8 +41,8 @@ function log(str) {
     console.appendChild(li);
 }
 
-if (window.layoutTestController)
-    window.layoutTestController.dumpAsText();
+if (window.testRunner)
+    window.testRunner.dumpAsText();
 
 // Set the input focus to the <select> element.
 var node = document.getElementById("test");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-scroll.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-scroll.html
index 0c6671d..a4f7194 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-typeahead-scroll.html
@@ -11,8 +11,8 @@
 </select>
 <div id="result">Cannot run interactively.</div>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
         var list = document.getElementById("list");
         list.focus();
         eventSender.keyDown("a");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-width-change.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-width-change.html
index a0ce2f4..ce1f44c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-width-change.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-width-change.html
@@ -2,14 +2,14 @@
     <head>
         <script>
             function test() {
-                if (window.layoutTestController)
-                    layoutTestController.waitUntilDone();
+                if (window.testRunner)
+                    testRunner.waitUntilDone();
                 setTimeout("test2()", 100);
             }
             function test2() {
                 document.getElementById('sl').options[0] = new Option ( "This text should fit in the list box", "1" );
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
         </script>
     </head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/advanced-get.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/advanced-get.html
index 9db9040..dbfa4ba 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/advanced-get.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/advanced-get.html
@@ -4,9 +4,9 @@
         <title>action="mailto" GET method</title>
         <script>
             function test() {
-              if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitForPolicyDelegate();
+              if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.waitForPolicyDelegate();
                 document.getElementsByTagName("form")[0].submit();
               }
             }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/advanced-put.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/advanced-put.html
index d2aec50..41155bc 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/advanced-put.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/advanced-put.html
@@ -4,9 +4,9 @@
         <title>action="mailto" PUT method</title>
         <script>
             function test() {
-              if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitForPolicyDelegate();
+              if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.waitForPolicyDelegate();
                 document.getElementsByTagName("form")[0].submit();
               }
             }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/formenctype-attribute-button-html.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/formenctype-attribute-button-html.html
index 36a790b..489fe21 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/formenctype-attribute-button-html.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/formenctype-attribute-button-html.html
@@ -13,9 +13,9 @@ Line 2
 <script>
 function test()
 {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitForPolicyDelegate();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitForPolicyDelegate();
     }
     document.getElementById("submit").click();
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/formenctype-attribute-input-html.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/formenctype-attribute-input-html.html
index 9e4a4f8..15f8cee 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/formenctype-attribute-input-html.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/formenctype-attribute-input-html.html
@@ -13,9 +13,9 @@ Line 2
 <script>
 function test()
 {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitForPolicyDelegate();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitForPolicyDelegate();
     }
     document.getElementById("submit").click();
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html
index d2604e5..91876a5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html
@@ -8,9 +8,9 @@ Line 2
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html
index d6c5064..0833db5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html
@@ -6,9 +6,9 @@ Field 2: <input type="text" size="10" maxlength="40" name="field2" value="value
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items.html
index 1ff9f5d..d750c34 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-multiple-items.html
@@ -7,9 +7,9 @@ Field 2: <input type="text" size="10" maxlength="40" name="field2" value="value
 <div>Expected results when clicking "Send" button:  A new mail message is created with an empty body.</div>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html
index 1dd0eb4..84bcf78 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html
@@ -7,9 +7,9 @@
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html
index 353ac6d..f5efeac 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html
@@ -7,9 +7,9 @@
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html
index f5f2402..450c03f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html
@@ -7,9 +7,9 @@
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii.html
index 450d889..13ad6cc 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-non-ascii.html
@@ -7,9 +7,9 @@
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-overwrite-query.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-overwrite-query.html
index 99a1934..b1089cb 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/get-overwrite-query.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/get-overwrite-query.html
@@ -6,9 +6,9 @@
 <div>Expected results when clicking "Send" button:  A new mail message is created with an empty body, and two addressees.</div>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-append-query.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-append-query.html
index ef9141c..8487319 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-append-query.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-append-query.html
@@ -6,9 +6,9 @@
 <div>Expected results when clicking "Send" button:  A new mail message is created with an empty body, and two addressees.</div>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html
index 384483c..7490fb5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html
@@ -8,9 +8,9 @@ Line 2
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html
index 50ccc59..cc86599 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html
@@ -8,9 +8,9 @@ Line 2
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html
index 81f2eeb..ab79066 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html
@@ -8,9 +8,9 @@ Line 2
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items.html
index 30cc5d9..8cfb4ee 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-multiple-items.html
@@ -7,9 +7,9 @@ Field 2: <input type="text" size="10" maxlength="40" name="field2" value="value
 <div>Expected results when clicking "Send" button:  A new mail message is created with a body of "field1=value 1&field2=value 2".</div>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html
index 2c1a22c..63c064b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html
@@ -11,9 +11,9 @@
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-text-plain.html b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-text-plain.html
index 41719ac..24d58b5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mailto/post-text-plain.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mailto/post-text-plain.html
@@ -11,9 +11,9 @@
 </form>
 <script>
 function test() {
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitForPolicyDelegate();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitForPolicyDelegate();
     document.getElementsByTagName("form")[0].submit();
   }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/menulist-disabled-selected-option.html b/third_party/WebKit/LayoutTests/fast/forms/menulist-disabled-selected-option.html
index 65b4c05..6dc8002 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/menulist-disabled-selected-option.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/menulist-disabled-selected-option.html
@@ -19,8 +19,8 @@ parent.innerHTML = '<form action="">'
     + '</select>'
     + '</form>';
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 var query = window.location.search;
 if (query.indexOf('submitted=true') == -1) {
     var select = document.getElementsByTagName('select')[0];
@@ -29,8 +29,8 @@ if (query.indexOf('submitted=true') == -1) {
 } else {
     shouldBe('query.indexOf("select=Disabled")', '-1');
     shouldBe('query.indexOf("select=Enabled")', '-1');
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 <script src="../../fast/js/resources/js-test-post.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/menulist-no-renderer-onmousedown.html b/third_party/WebKit/LayoutTests/fast/forms/menulist-no-renderer-onmousedown.html
index 2d1c090..f8e60b6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/menulist-no-renderer-onmousedown.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/menulist-no-renderer-onmousedown.html
@@ -3,8 +3,8 @@
         <script>
             function test()
             {
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
                 var sl = document.getElementById('sl');
                 var event = document.createEvent("MouseEvent");
                 event.initMouseEvent("mousedown", true, true, window, 1, sl.offsetLeft, sl.offsetTop, sl.offsetLeft, sl.offsetTop, false, false, false, false, 0, document);
diff --git a/third_party/WebKit/LayoutTests/fast/forms/menulist-selection-reset.html b/third_party/WebKit/LayoutTests/fast/forms/menulist-selection-reset.html
index 20ac958..0f790d1 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/menulist-selection-reset.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/menulist-selection-reset.html
@@ -6,8 +6,8 @@
 <p id="result">
 </p>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     select.selectedIndex = 1;
     result.innerText = select.selectedIndex == 1 ? "PASS" : "FAIL";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/menulist-submit-without-selection.html b/third_party/WebKit/LayoutTests/fast/forms/menulist-submit-without-selection.html
index 79b3431..02e6d16 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/menulist-submit-without-selection.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/menulist-submit-without-selection.html
@@ -18,8 +18,8 @@ parent.innerHTML = '<form action="">'
     + '</select>'
     + '</form>';
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 var query = window.location.search;
 if (query.indexOf('submitted=true') == -1) {
     var select = document.getElementsByTagName('select')[0];
@@ -27,8 +27,8 @@ if (query.indexOf('submitted=true') == -1) {
     document.forms[0].submit();
 } else {
     shouldBe('query.indexOf("select=Disabled")', '-1');
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 <script src="../../fast/js/resources/js-test-post.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/menulist-width-change.html b/third_party/WebKit/LayoutTests/fast/forms/menulist-width-change.html
index 0aa0ccb..c0e1291 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/menulist-width-change.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/menulist-width-change.html
@@ -2,8 +2,8 @@
     <head>
         <script>
             function test() {
-                if (window.layoutTestController)
-                    layoutTestController.waitUntilDone();
+                if (window.testRunner)
+                    testRunner.waitUntilDone();
                     
                 setTimeout('addLongOption();', 100);
             }
@@ -14,8 +14,8 @@
                 var sl = document.getElementById("t");
                 sl.appendChild(newOpt);
                                 
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
         </script>
     </head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/misplaced-img-form-registration.html b/third_party/WebKit/LayoutTests/fast/forms/misplaced-img-form-registration.html
index 04fdc98..c65e45fc 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/misplaced-img-form-registration.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/misplaced-img-form-registration.html
@@ -1,7 +1,7 @@
 <p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=34488">bug 34488</a>: Crash in mangleme in WebCore::Element::getAttribute.</p>
 <p>Pass if no crash or assertion failure.</p>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 <FORM><SELECT><IMG>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/missing-action.html b/third_party/WebKit/LayoutTests/fast/forms/missing-action.html
index 6ef1131..25b2e84 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/missing-action.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/missing-action.html
@@ -11,9 +11,9 @@
 </form>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.URL.indexOf('?') == -1) {
@@ -27,8 +27,8 @@ if (document.URL.indexOf('?') == -1) {
     else
         document.write("<p>Failure</p>");
     
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/multiple-form-submission-protection-mouse.html b/third_party/WebKit/LayoutTests/fast/forms/multiple-form-submission-protection-mouse.html
index 4356dce..e88f6e5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/multiple-form-submission-protection-mouse.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/multiple-form-submission-protection-mouse.html
@@ -2,10 +2,10 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.setCanOpenWindows();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.setCanOpenWindows();
+    testRunner.waitUntilDone();
 }
 
 addEventListener('message', function(e) {
@@ -43,7 +43,7 @@ function submitTo(target)
 <li>Click on "Click 2" to submit form to this window. Single word "SUCCESS" should replace the contents of this document.
 </ol>
 <p>If either event doesn't occur, the test has failed.
-<form method="post" name="test" action="data:text/html,<script>if (opener) { opener.postMessage('trololo', '*'); window.close(); } else { document.write('SUCCESS'); window.layoutTestController && layoutTestController.notifyDone(); }</script>">
+<form method="post" name="test" action="data:text/html,<script>if (opener) { opener.postMessage('trololo', '*'); window.close(); } else { document.write('SUCCESS'); window.testRunner && testRunner.notifyDone(); }</script>">
 <input type="button" id="button1" value="Click 1" onclick="submitTo('_new')">
 <input type="button" id="button2" value="Click 2" onclick="submitTo('_self')">
 </form>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/multiple-selected-options-innerHTML.html b/third_party/WebKit/LayoutTests/fast/forms/multiple-selected-options-innerHTML.html
index b22ed08..a517c4a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/multiple-selected-options-innerHTML.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/multiple-selected-options-innerHTML.html
@@ -8,8 +8,8 @@ Selecting a bank in American Express Pay Bill fails.</p>
 </select>
 <div id=paymentoptions></div>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 document.getElementById("paymentoptions").innerHTML = 
     '<select>' +
@@ -17,7 +17,7 @@ document.getElementById("paymentoptions").innerHTML =
     '<option selected>PASS</option>' +
     '</select>'
 
-if (window.layoutTestController && document.getElementsByTagName("select")[0].value == "PASS" && document.getElementsByTagName("select")[1].value == "PASS")
+if (window.testRunner && document.getElementsByTagName("select")[0].value == "PASS" && document.getElementsByTagName("select")[1].value == "PASS")
     document.write("PASS");
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/mutation-event-recalc.html b/third_party/WebKit/LayoutTests/fast/forms/mutation-event-recalc.html
index ccbac90..2d605d4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/mutation-event-recalc.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/mutation-event-recalc.html
@@ -5,8 +5,8 @@
 </form>
 <div id=res></div>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var select = document.forms[0].elements[0];
 var res = document.getElementById("res");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/no-autofocus-in-sandbox.html b/third_party/WebKit/LayoutTests/fast/forms/no-autofocus-in-sandbox.html
index 7aca1e9..68af8e5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/no-autofocus-in-sandbox.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/no-autofocus-in-sandbox.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 This test passes if the activeElement is the body rather than the input element
 (which it would be if the sandbox didn't succeed in blocking autofocus).
diff --git a/third_party/WebKit/LayoutTests/fast/forms/number/input-number-crash.html b/third_party/WebKit/LayoutTests/fast/forms/number/input-number-crash.html
index 3086af8e..5d741b8 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/number/input-number-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/number/input-number-crash.html
@@ -3,8 +3,8 @@
         <script>
             function test()
             {
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
                 var input = document.getElementById("test");
                 var x = input.offsetLeft + input.offsetWidth - 8;
                 var y = input.offsetTop + input.offsetHeight - 7;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/number/input-number-spinbutton-crash.html b/third_party/WebKit/LayoutTests/fast/forms/number/input-number-spinbutton-crash.html
index fbda964..2d2a3a7 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/number/input-number-spinbutton-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/number/input-number-spinbutton-crash.html
@@ -8,8 +8,8 @@ input::-webkit-inner-spin-button { display: none; }
 <body>
 <input type="number" id="in">
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 var input = document.getElementById('in');
 var evt = document.createEvent("MouseEvent");
 evt.initMouseEvent("click", true, true, window, 10, 10, 10, 10);
diff --git a/third_party/WebKit/LayoutTests/fast/forms/number/number-input-changeevent.html b/third_party/WebKit/LayoutTests/fast/forms/number/number-input-changeevent.html
index 8e41528..c5260a4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/number/number-input-changeevent.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/number/number-input-changeevent.html
@@ -7,8 +7,8 @@
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var numberOfChangeEventsFired = 0;
 var test = document.getElementById('test');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-events.html b/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-events.html
index a2a5b66..0e17648 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-events.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-events.html
@@ -16,7 +16,7 @@ num1.onchange = function () { log("onchange(" + num1.value + ")"); }
 num1.oninput = function () { log("oninput(" + num1.value + ")"); }
 
 function testIt() {
-    layoutTestController.dumpAsText();
+    testRunner.dumpAsText();
 
     // Click spin Up button
     eventSender.mouseMoveTo(
@@ -26,7 +26,7 @@ function testIt() {
     eventSender.mouseUp();
 }
 
-if (window.layoutTestController) {
+if (window.testRunner) {
   testIt();
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-gets-disabled-or-readonly.html b/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-gets-disabled-or-readonly.html
index 400fa0c..7cedf7d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-gets-disabled-or-readonly.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-gets-disabled-or-readonly.html
@@ -26,7 +26,7 @@ var input;
 var delay;
 window.jsTestIsAsync = true;
 
-if (window.layoutTestController && window.eventSender) {
+if (window.testRunner && window.eventSender) {
     testInputs = [document.getElementById("readonlyNumber"), document.getElementById("disabledNumber")];
     setTimeout(function() {
         nextInputTest();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-state.html b/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-state.html
index 9972b9e5..37421a0 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-state.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/number/spin-button-state.html
@@ -15,7 +15,7 @@ var logs = document.getElementById("logs");
 function log(msg) { logs.innerHTML += msg + "<br>"; }
 
 function testIt() {
-    layoutTestController.dumpAsText();
+    testRunner.dumpAsText();
 
     var outer = document.getElementById("outer");
 
@@ -40,7 +40,7 @@ function testIt() {
     log("expect 1, actual=" + num2.value);
 }
 
-if (window.layoutTestController) {
+if (window.testRunner) {
     testIt();
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/number/spin-in-multi-column.html b/third_party/WebKit/LayoutTests/fast/forms/number/spin-in-multi-column.html
index a8bf62d..2566000 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/number/spin-in-multi-column.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/number/spin-in-multi-column.html
@@ -83,12 +83,12 @@ function installMouseTracker() {
 
 function test()
 {
-    if (!window.layoutTestController) {
+    if (!window.testRunner) {
         installMouseTracker();
         return;
     }
 
-    layoutTestController.dumpAsText();
+    testRunner.dumpAsText();
 
     for (var formIndex = 0; formIndex < numForms; formIndex++) {
         for (var colIndex = 0; colIndex < numCols; colIndex++) {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/numeric-input-name.html b/third_party/WebKit/LayoutTests/fast/forms/numeric-input-name.html
index d84ab3b..5e1fe68 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/numeric-input-name.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/numeric-input-name.html
@@ -1,8 +1,8 @@
 <html>
     <head>
         <script type="text/javascript">
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
 
             function showMe()
             {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/onchange-change-type.html b/third_party/WebKit/LayoutTests/fast/forms/onchange-change-type.html
index 1d5dbfd..25522a4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/onchange-change-type.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/onchange-change-type.html
@@ -16,8 +16,8 @@
           didFireOnChange = true;
         }
 
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
         }
 
         tf.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/onchange-enter-submit.html b/third_party/WebKit/LayoutTests/fast/forms/onchange-enter-submit.html
index 024af18..98fb02f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/onchange-enter-submit.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/onchange-enter-submit.html
@@ -9,12 +9,12 @@
     function test() {
         var tf = document.getElementById('tf');
 
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
         }
         
         tf.focus();
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             eventSender.keyDown('a');
             eventSender.keyDown('\r');
         }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/onchange-setvalueforuser.html b/third_party/WebKit/LayoutTests/fast/forms/onchange-setvalueforuser.html
index 4dbb8f7..3f07554 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/onchange-setvalueforuser.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/onchange-setvalueforuser.html
@@ -10,13 +10,13 @@
           didFireOnChange = true;
         }
 
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
         }
 
         tf.focus();
-        if (window.layoutTestController) {
-            layoutTestController.setValueForUser(tf, 'Hello!');
+        if (window.testRunner) {
+            testRunner.setValueForUser(tf, 'Hello!');
         }
 
         // Should not fire the event until focus is lost.
diff --git a/third_party/WebKit/LayoutTests/fast/forms/onselect-selectall.html b/third_party/WebKit/LayoutTests/fast/forms/onselect-selectall.html
index 93dc297..6938e01 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/onselect-selectall.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/onselect-selectall.html
@@ -3,8 +3,8 @@
 <script src="../../editing/editing.js"></script>
 <script>
 function test() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
     }
     document.getElementById('tf').focus();
     selectAllCommand();    
diff --git a/third_party/WebKit/LayoutTests/fast/forms/onselect-textarea.html b/third_party/WebKit/LayoutTests/fast/forms/onselect-textarea.html
index 5a2a093..ca5c97f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/onselect-textarea.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/onselect-textarea.html
@@ -9,8 +9,8 @@ textarea { -webkit-appearance: textarea;}
     }
     
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
         var ta = document.getElementById('ta');
 
         log('Calling focus on textarea');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/onselect-textfield.html b/third_party/WebKit/LayoutTests/fast/forms/onselect-textfield.html
index 2c4b4b1..388c1f4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/onselect-textfield.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/onselect-textfield.html
@@ -6,8 +6,8 @@
     }
     
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
         var tf = document.getElementById('tf');
       
         log('Calling focus on text field');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/option-change-single-selected.html b/third_party/WebKit/LayoutTests/fast/forms/option-change-single-selected.html
index d8e3611..04b8b7c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/option-change-single-selected.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/option-change-single-selected.html
@@ -15,8 +15,8 @@
 <div id=result></div>
 <script>
 
-if (window.layoutTestController)
-  layoutTestController.dumpAsText();
+if (window.testRunner)
+  testRunner.dumpAsText();
 
 document.forms[0].elements[0].options[1].selected = true;
 document.forms[0].elements[1].options[1].selected = true;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/option-constructor-selected.html b/third_party/WebKit/LayoutTests/fast/forms/option-constructor-selected.html
index 55724ac..b7671e2 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/option-constructor-selected.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/option-constructor-selected.html
@@ -1,8 +1,8 @@
 <html>
 <script>
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         var popup = document.getElementById('popup');
         var success;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/option-in-optgroup-removal.html b/third_party/WebKit/LayoutTests/fast/forms/option-in-optgroup-removal.html
index acf3ef3..140d85e 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/option-in-optgroup-removal.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/option-in-optgroup-removal.html
@@ -1,8 +1,8 @@
 <html>
 <script>
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
         var list = document.getElementById("S1");
         list.remove(3);
         log(list.length == 3 ? "Passed" : "Failed");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/option-mouseevents.html b/third_party/WebKit/LayoutTests/fast/forms/option-mouseevents.html
index d40087c..8f2fe2b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/option-mouseevents.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/option-mouseevents.html
@@ -44,9 +44,9 @@ function mouseeventverify2(event, x, y, offsetX, offsetY, target, type)
     shouldBe("event.y", event.y, y);
 }
 function test() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     if (window.eventSender) {
@@ -83,8 +83,8 @@ function test() {
         eventSender.mouseUp();
     }
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/password-doubleclick-selection.html b/third_party/WebKit/LayoutTests/fast/forms/password-doubleclick-selection.html
index 147c63a..d4e8d4f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/password-doubleclick-selection.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/password-doubleclick-selection.html
@@ -5,8 +5,8 @@
         var pass = document.getElementById('tf');
         var res = document.getElementById('res');
 
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
             eventSender.mouseMoveTo(45, 25);
             eventSender.mouseDown();
             eventSender.mouseUp();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/password-placeholder-text-security.html b/third_party/WebKit/LayoutTests/fast/forms/password-placeholder-text-security.html
index 21bef87..b07491c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/password-placeholder-text-security.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/password-placeholder-text-security.html
@@ -3,8 +3,8 @@
         <script>
             function test()
             {
-                if (window.layoutTestController)
-                    layoutTestController.waitUntilDone();
+                if (window.testRunner)
+                    testRunner.waitUntilDone();
                     
                 // 1) leave field 1 alone. It should show the placeholder text.
                 // 2) focus field 2 and type.  It should show bullets for the password.
@@ -18,8 +18,8 @@
                     password.value = "";
                     password.blur();
 
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
         </script>
     </head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/paste-into-textarea.html b/third_party/WebKit/LayoutTests/fast/forms/paste-into-textarea.html
index 4f72001..a0055de 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/paste-into-textarea.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/paste-into-textarea.html
@@ -1,8 +1,8 @@
 <p>This tests for a bug where text pasted into a textarea would appear one character before the position where it was pasted.</p>
 <textarea rows=5 id="test">xx</textarea>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 var e = document.getElementById("test");
 e.setSelectionRange(1, 1);
 document.execCommand("InsertHTML", false, "(There should be one 'x' before and after this sentence.)");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/paste-multiline-text-input.html b/third_party/WebKit/LayoutTests/fast/forms/paste-multiline-text-input.html
index 83cc794..c8e347e 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/paste-multiline-text-input.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/paste-multiline-text-input.html
@@ -1,8 +1,8 @@
 <html> 
   <head> 
     <script> 
-        if (window.layoutTestController)
-            window.layoutTestController.dumpAsText();
+        if (window.testRunner)
+            window.testRunner.dumpAsText();
 
         function getInput()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-001.html b/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-001.html
index 1f07828..2993ea7 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-001.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-001.html
@@ -7,8 +7,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         v = document.getElementsByName("victim");
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-002.html b/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-002.html
index e9db428..185f90e 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-002.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-002.html
@@ -7,8 +7,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         v = document.getElementsByName("victim");
         v[0].pattern = "something";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-003.html b/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-003.html
index 3eea6f5..7231ac2 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-003.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/pattern-attribute-003.html
@@ -7,8 +7,8 @@
     }
 
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         v = document.getElementsByName("victim");
         v[0].pattern += " else";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/placeholder-crash-with-scrollbar-corner.html b/third_party/WebKit/LayoutTests/fast/forms/placeholder-crash-with-scrollbar-corner.html
index 0c1c267..864ec11 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/placeholder-crash-with-scrollbar-corner.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/placeholder-crash-with-scrollbar-corner.html
@@ -10,13 +10,13 @@
 document.getElementById('i').addEventListener("keydown", function() {
     this.style.display = "none";
     document.getElementById('console').innerText = 'PASS (not crashed)';
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 });
 
-if (window.layoutTestController && window.eventSender) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner && window.eventSender) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
     setTimeout(function() {
         document.getElementById('i').focus();
         eventSender.keyDown('a');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/placeholder-non-textfield.html b/third_party/WebKit/LayoutTests/fast/forms/placeholder-non-textfield.html
index d0eeb67..c7047ef 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/placeholder-non-textfield.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/placeholder-non-textfield.html
@@ -6,8 +6,8 @@
 </p>
 <input id="target" type="button" value="PASS">
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     document.body.offsetTop;
     document.getElementById("target").setAttribute("placeholder", "placeholder");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/placeholder-set-attribute.html b/third_party/WebKit/LayoutTests/fast/forms/placeholder-set-attribute.html
index 3274510..02ba55c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/placeholder-set-attribute.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/placeholder-set-attribute.html
@@ -3,14 +3,14 @@
 function finishTest()
 {
     document.getElementById('input').setAttribute('placeholder','Placeholder');
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
     setTimeout(finishTest, 0);
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/plaintext-mode-1.html b/third_party/WebKit/LayoutTests/fast/forms/plaintext-mode-1.html
index bb6be90..4f9851f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/plaintext-mode-1.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/plaintext-mode-1.html
@@ -25,8 +25,8 @@ function assert(func, args, expected)
 
 <script>
 
-if (window.layoutTestController)
-    window.layoutTestController.dumpAsText();
+if (window.testRunner)
+    window.testRunner.dumpAsText();
 
 var e = document.getElementById("textfield");
 e.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/plaintext-mode-2.html b/third_party/WebKit/LayoutTests/fast/forms/plaintext-mode-2.html
index 884d1e3..232128c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/plaintext-mode-2.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/plaintext-mode-2.html
@@ -21,8 +21,8 @@ function assert(func, args, expected) {
 <div id="richcontent">This <b>styled <i>text</i></b>, and <a href="http://www.google.com"> link</a> will be pasted into the textfield.  All richness should be stripped.</div>
 <ol id="console"></ol>
 <script>
-    if (window.layoutTestController)
-        window.layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        window.testRunner.waitUntilDone();
 
 var richcontent = document.getElementById("richcontent");
 var s = window.getSelection();
@@ -36,7 +36,7 @@ e.setSelectionRange(0, 0);
 window.setTimeout(paste, 500);
 function paste() {
     assert("document.execCommand", "Paste", true);
-    if (window.layoutTestController)
-        window.layoutTestController.notifyDone();
+    if (window.testRunner)
+        window.testRunner.notifyDone();
 }
 </script>
\ No newline at end of file
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio-checkbox-restore-indeterminate.html b/third_party/WebKit/LayoutTests/fast/forms/radio-checkbox-restore-indeterminate.html
index fb89ccf..33bc7a7 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio-checkbox-restore-indeterminate.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio-checkbox-restore-indeterminate.html
@@ -2,8 +2,8 @@
 <head>
 
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function dispatchEvent(target, eventType, offsetX, offsetY)
     {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/indeterminate-radio.html b/third_party/WebKit/LayoutTests/fast/forms/radio/indeterminate-radio.html
index d3239e3..2c29d1b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/indeterminate-radio.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/indeterminate-radio.html
@@ -20,8 +20,8 @@
     <div id="testresult" style="color: blue">Running</div>
     <script type="text/javascript">
 
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function mytest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/input-radio-checked-tab.html b/third_party/WebKit/LayoutTests/fast/forms/radio/input-radio-checked-tab.html
index 20775f0..5ca3962 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/input-radio-checked-tab.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/input-radio-checked-tab.html
@@ -2,8 +2,8 @@
 <head>
     <script>
     function runTest() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         document.getElementById('tom').checked = false;
         document.getElementById('result').innerHTML = 'FAILURE';
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/interactive-validation-required-radio.html b/third_party/WebKit/LayoutTests/fast/forms/radio/interactive-validation-required-radio.html
index df1f081..daf32c6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/interactive-validation-required-radio.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/interactive-validation-required-radio.html
@@ -21,8 +21,8 @@ function startOrVerify() {
         testPassed('The form should be submitted.');
         shouldBeTrue('location.search.indexOf("terms=on") != -1');
         debug('TEST COMPLETE');
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     } else {
         document.getElementById('i1').checked = true;
         // HTMLFormElement::submit() skips validation. Use the submit button.
@@ -31,8 +31,8 @@ function startOrVerify() {
     }
 }
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 window.onload = startOrVerify;
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/radio-button-no-change-event.html b/third_party/WebKit/LayoutTests/fast/forms/radio/radio-button-no-change-event.html
index 06d6689..edc6ae1 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/radio-button-no-change-event.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/radio-button-no-change-event.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) layoutTestController.dumpAsText();
+if (window.testRunner) testRunner.dumpAsText();
 function load() {
     document.getElementById("1").innerText = "If you see this paragraph and the one below and both agree, the test has succeeded.";
 }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/radio-check-click-and-drag.html b/third_party/WebKit/LayoutTests/fast/forms/radio/radio-check-click-and-drag.html
index c995a31..db01c8f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/radio-check-click-and-drag.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/radio-check-click-and-drag.html
@@ -8,13 +8,13 @@
                 eventSender.mouseUp();                
             }
             function runTest() {
-                if (!window.layoutTestController) {
+                if (!window.testRunner) {
                     alert('this test can only be run by DumpRenderTree.')
                     return;
                 }
 
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
                     
                 var checkbox = document.getElementById('checkbox');                
                 var radio = document.getElementById('radio');                
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/radio-group-keyboard-change-event.html b/third_party/WebKit/LayoutTests/fast/forms/radio/radio-group-keyboard-change-event.html
index dda6330..1ae468f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/radio-group-keyboard-change-event.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/radio-group-keyboard-change-event.html
@@ -73,8 +73,8 @@ function assertNotChecked(value)
         fail(value + ' should not be checked');
 }
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 if (window.eventSender) {
     getRadio('a').focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/radio-nested-labels.html b/third_party/WebKit/LayoutTests/fast/forms/radio/radio-nested-labels.html
index 49a8ead..79f6c07 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/radio-nested-labels.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/radio-nested-labels.html
@@ -1,11 +1,11 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
 }
 
 function checkButton() {
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
 
     var radioFour = document.getElementById("four");
@@ -19,7 +19,7 @@ function checkButton() {
     var result = document.getElementById("result");
     if (radioFour.checked)
         result.innerHTML = "Test Succeeded!";
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 </script>
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/radio-no-theme-padding.html b/third_party/WebKit/LayoutTests/fast/forms/radio/radio-no-theme-padding.html
index cc08323..1fe2d42 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/radio-no-theme-padding.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/radio-no-theme-padding.html
@@ -1,8 +1,8 @@
 <script>
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var radio = document.getElementById("radio");
     var padding = getComputedStyle(radio, "").getPropertyValue("padding-left");
     if (padding == "0px")
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked.html b/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked.html
index 14effd7..566ac70 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked.html
@@ -24,8 +24,8 @@
     <div id="result"></div>
 
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var i1, i2, i3, i4, i5, i6, i7, i8, i9, i10;
 i1 = document.getElementById('in1').checked;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked_dynamic.html b/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked_dynamic.html
index 6ede2ff..b2105e6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked_dynamic.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked_dynamic.html
@@ -41,8 +41,8 @@ Test 4: Transfer from &lt;form&gt; to &lt;form&gt;
 <div id="result4">Test 4 Failed</div>
 
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var radio1 = document.getElementById("radio1");
 var radio2 = document.getElementById("radio2");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked_name.html b/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked_name.html
index a3cbebe..80f0813 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked_name.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/radio_checked_name.html
@@ -2,8 +2,8 @@
     <head>
         <script>
         function test() {
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
                 
             var r1 = document.getElementById('r1');
             verifyCheckedState(r1, true);
@@ -20,7 +20,7 @@
             
             // Attempt to check with the spacebar
             r2.focus();
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 eventSender.keyDown(' ');
             }
             verifyCheckedState(r2, true);
@@ -28,7 +28,7 @@
             var r3 = document.getElementById('r3');
                                      
             // Attempt to check with the mouse
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 eventSender.mouseMoveTo(r3.offsetLeft + 7, r3.offsetTop + 7);
                 eventSender.mouseDown();
                 eventSender.mouseUp();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/remove-radio-button-assert.html b/third_party/WebKit/LayoutTests/fast/forms/radio/remove-radio-button-assert.html
index cbe5919..37e3e3a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/remove-radio-button-assert.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/remove-radio-button-assert.html
@@ -1,8 +1,8 @@
 <p>This tests the code path for destruction of a radio button when it's checked, when the form outlives the radio button, but where the radio button is never explicitly removed from the form.</p>
 <div id="container"><form id="form"><input type="radio" name="button" checked></form></div>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 var form = document.getElementById("form");
 document.getElementById("container").removeChild(form);
 form.innerHTML="";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/radio/state-restore-radio-group.html b/third_party/WebKit/LayoutTests/fast/forms/radio/state-restore-radio-group.html
index 6e54a85..66547aa 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/radio/state-restore-radio-group.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/radio/state-restore-radio-group.html
@@ -22,8 +22,8 @@ function runTest() {
     var state = document.getElementById('emptyOnFirstVisit');
     if (!state.value) {
         // First visit.
-        if (window.layoutTestController)
-            layoutTestController.waitUntilDone();
+        if (window.testRunner)
+            testRunner.waitUntilDone();
         state.value = 'visited';
 
         document.getElementById('input1').checked = true;
@@ -33,8 +33,8 @@ function runTest() {
         // Second visit.
         shouldBeTrue('document.getElementById("input1").checked');
         shouldBeFalse('document.getElementById("input2").checked');
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/range-input-dynamic-oninput.html b/third_party/WebKit/LayoutTests/fast/forms/range/range-input-dynamic-oninput.html
index a4753e8..2b7c04b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/range-input-dynamic-oninput.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/range-input-dynamic-oninput.html
@@ -8,8 +8,8 @@ function log(msg) {
 }
 
 function test() {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var input = document.getElementsByTagName('input')[0]
     input.value = 200;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/slider-delete-while-dragging-thumb.html b/third_party/WebKit/LayoutTests/fast/forms/range/slider-delete-while-dragging-thumb.html
index e8291c6..d43a691 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/slider-delete-while-dragging-thumb.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/slider-delete-while-dragging-thumb.html
@@ -17,7 +17,7 @@
                 eventSender.mouseDown();
                 eventSender.mouseUp();
 
-                layoutTestController.notifyDone();
+                testRunner.notifyDone();
             }
             
             function deleteSlider()
@@ -32,13 +32,13 @@
             
             function drag()
             {
-                if (!window.layoutTestController)
+                if (!window.testRunner)
                     return;
 
                 var slider = document.getElementById('slider');
 
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
 
                 // drag slider, leave the mouse down
                 log("dragging slider");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/slider-hit-testing.html b/third_party/WebKit/LayoutTests/fast/forms/range/slider-hit-testing.html
index 5f6104c..abb0f9d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/slider-hit-testing.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/slider-hit-testing.html
@@ -8,8 +8,8 @@
 // Force a layout so the slider starts with the default width.
 document.body.offsetLeft;
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
 }
 
 window.onload = function() {
@@ -19,7 +19,7 @@ window.onload = function() {
 
 function changeAndCheckRangeValue()
 {
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
 
     // Click on the right side of the slider.  This should cause the thumb
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/slider-in-multi-column.html b/third_party/WebKit/LayoutTests/fast/forms/range/slider-in-multi-column.html
index fc0c3b2..aa27b87 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/slider-in-multi-column.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/slider-in-multi-column.html
@@ -71,10 +71,10 @@ function testIt(formIndex, colIndex, ofsX, expected)
 
 function test()
 {
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
 
-    layoutTestController.dumpAsText();
+    testRunner.dumpAsText();
 
     for (var formIndex = 0; formIndex < numForms; formIndex++) {
         for (var colIndex = 0; colIndex < numCols; colIndex++) {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/slider-mouse-events.html b/third_party/WebKit/LayoutTests/fast/forms/range/slider-mouse-events.html
index 5548780..a0dce8b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/slider-mouse-events.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/slider-mouse-events.html
@@ -9,8 +9,8 @@
             function test()
             {
                 var slider = document.getElementById('slider');
-                if (window.layoutTestController) {
-                    layoutTestController.dumpAsText();
+                if (window.testRunner) {
+                    testRunner.dumpAsText();
                     eventSender.mouseMoveTo(slider.offsetLeft + 7, slider.offsetTop + 7);
                     eventSender.mouseDown();
                     log(slider.value)
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/slider-onchange-event.html b/third_party/WebKit/LayoutTests/fast/forms/range/slider-onchange-event.html
index a2a2d6a..3dc3ca1 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/slider-onchange-event.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/slider-onchange-event.html
@@ -9,8 +9,8 @@
             function test()
             {
                 var slider = document.getElementById('slider');
-                if (window.layoutTestController) {
-                    layoutTestController.dumpAsText();
+                if (window.testRunner) {
+                    testRunner.dumpAsText();
                     // slider drag
                     eventSender.mouseMoveTo(slider.offsetLeft + 7, slider.offsetTop + 7);
                     eventSender.mouseDown();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/slider-transformed.html b/third_party/WebKit/LayoutTests/fast/forms/range/slider-transformed.html
index 1ca081a..8eadddc 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/slider-transformed.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/slider-transformed.html
@@ -14,8 +14,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function dispatchEvent(eventType, clientX, clientY)
     {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/slider-zoomed.html b/third_party/WebKit/LayoutTests/fast/forms/range/slider-zoomed.html
index dbe9899..23a3681 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/slider-zoomed.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/slider-zoomed.html
@@ -15,8 +15,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function dispatchEvent(eventType, clientX, clientY)
     {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/thumbslider-crash.html b/third_party/WebKit/LayoutTests/fast/forms/range/thumbslider-crash.html
index e84104e..ab11c3f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/thumbslider-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/thumbslider-crash.html
@@ -7,8 +7,8 @@
 <body>
 PASS If this test does not crash. http://bugs.webkit.org/show_bug.cgi?id=12045
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 </body>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/removed-image-as-property.html b/third_party/WebKit/LayoutTests/fast/forms/removed-image-as-property.html
index 194031b..0062ce3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/removed-image-as-property.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/removed-image-as-property.html
@@ -5,9 +5,9 @@
 <img src="" id="i">
 </form>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function gc()
@@ -33,8 +33,8 @@ function test()
         } catch (ex) {
             document.getElementsByTagName("div")[0].innerHTML = "PASS";
         }
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }, 0);
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/render-text-crash.html b/third_party/WebKit/LayoutTests/fast/forms/render-text-crash.html
index 3fee346..db2a5e3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/render-text-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/render-text-crash.html
@@ -10,8 +10,8 @@
 ><input type="text" onkeydown="move(this.nextSibling)">
 <script type="text/javascript">
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var activeInput = null;
 
@@ -29,10 +29,10 @@ var inputs = document.getElementsByTagName('input');
 move(inputs[0]);
 
 if (window.eventSender) {
-    layoutTestController.waitUntilDone();
+    testRunner.waitUntilDone();
     for (var i = 0; i < inputs.length - 1; i++)
         eventSender.keyDown('downArrow', []);
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 
 document.body.appendChild(document.createTextNode('PASS'));
diff --git a/third_party/WebKit/LayoutTests/fast/forms/reparented-image-as-property.html b/third_party/WebKit/LayoutTests/fast/forms/reparented-image-as-property.html
index 4a37be9..676fd33 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/reparented-image-as-property.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/reparented-image-as-property.html
@@ -5,8 +5,8 @@
 <form></form>
 <div id="div"></div>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(msg)
 {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/reset-autofilled.html b/third_party/WebKit/LayoutTests/fast/forms/reset-autofilled.html
index d3fbe7f2..662f12e 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/reset-autofilled.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/reset-autofilled.html
@@ -7,13 +7,13 @@
     }
 
     function test() {
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
         }
 
         var field = document.getElementById('field');
-        if (window.layoutTestController) {
-            layoutTestController.setAutofilled(field, true);
+        if (window.testRunner) {
+            testRunner.setAutofilled(field, true);
         } else {
             testFailed('This test requires a LayoutTestController.');
             return;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/resources/form-and-frame-interaction-retains-values-main.html b/third_party/WebKit/LayoutTests/fast/forms/resources/form-and-frame-interaction-retains-values-main.html
index 95243a1..d28ad57 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/resources/form-and-frame-interaction-retains-values-main.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/resources/form-and-frame-interaction-retains-values-main.html
@@ -2,10 +2,10 @@
 <html>

 <head>

   <script>

-    if (window.layoutTestController) {

-        window.layoutTestController.dumpAsText();

-        window.layoutTestController.dumpChildFramesAsText();

-        window.layoutTestController.waitUntilDone();

+    if (window.testRunner) {

+        window.testRunner.dumpAsText();

+        window.testRunner.dumpChildFramesAsText();

+        window.testRunner.waitUntilDone();

     }

 

   function performTest() {

@@ -13,8 +13,8 @@
       window.name = "";

       if(document.getElementById("text").value == "Correct Value")

         document.getElementById("result").innerHTML = "PASS";

-      if (window.layoutTestController)

-        window.layoutTestController.notifyDone();

+      if (window.testRunner)

+        window.testRunner.notifyDone();

     } else {

       document.getElementById("text").value = "Old Value";

       window.frames[0].location = "form-and-frame-interaction-retains-values-submit.html";

diff --git a/third_party/WebKit/LayoutTests/fast/forms/restore-selection-after-layout.html b/third_party/WebKit/LayoutTests/fast/forms/restore-selection-after-layout.html
index c0028e9..b5b2f65 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/restore-selection-after-layout.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/restore-selection-after-layout.html
@@ -3,13 +3,13 @@
 <html>
 <head>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function sendKey(element, key) {
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             key = key.substr(0,1).toLowerCase() + key.substr(1); // lowercase 1st letter for eventSender
             eventSender.keyDown(key);
         } else {
@@ -46,8 +46,8 @@
         sendKey(testInput, 'r');
 
         document.getElementById('result').innerText = testInput.value;
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
       }, 0);
     }
     
diff --git a/third_party/WebKit/LayoutTests/fast/forms/saved-state-adoptNode-crash.html b/third_party/WebKit/LayoutTests/fast/forms/saved-state-adoptNode-crash.html
index 39b5641..79f6ec4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/saved-state-adoptNode-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/saved-state-adoptNode-crash.html
@@ -7,14 +7,14 @@ Marshmallows
 <iframe id="iframe" src="data:text/html,"></iframe>
 <input type="password" id="password" value="seikooC">
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     var newDoc = document.getElementById("iframe").contentDocument;
     newDoc.adoptNode(document.getElementById("select"));
     newDoc.adoptNode(document.getElementById("textarea"));
     newDoc.adoptNode(document.getElementById("password"));
-    location.href="data:text/html,SUCCESS<script>if (window.layoutTestController) layoutTestController.notifyDone()</scr" + "ipt>";
+    location.href="data:text/html,SUCCESS<script>if (window.testRunner) testRunner.notifyDone()</scr" + "ipt>";
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search-abs-pos-cancel-button.html b/third_party/WebKit/LayoutTests/fast/forms/search-abs-pos-cancel-button.html
index 8118227..ee85997 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search-abs-pos-cancel-button.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search-abs-pos-cancel-button.html
@@ -3,8 +3,8 @@
     <title>Search Field with Transform</title>
     <script src="resources/common.js"></script>
     <script type="text/javascript" charset="utf-8">
-      if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+      if (window.testRunner)
+        testRunner.dumpAsText();
     </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search-cancel-button-mouseup.html b/third_party/WebKit/LayoutTests/fast/forms/search-cancel-button-mouseup.html
index 203e001..97c7aab 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search-cancel-button-mouseup.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search-cancel-button-mouseup.html
@@ -5,10 +5,10 @@
     <script>
         function test()
         {
-            if (!window.layoutTestController)
+            if (!window.testRunner)
                 return;
 
-            layoutTestController.dumpAsText();
+            testRunner.dumpAsText();
 
             var s1 = document.getElementById("search1");
             var s2 = document.getElementById("search2");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search-click-in-placeholder.html b/third_party/WebKit/LayoutTests/fast/forms/search-click-in-placeholder.html
index ba213bc..17b18c3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search-click-in-placeholder.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search-click-in-placeholder.html
@@ -12,7 +12,7 @@
             if (!window.eventSender)
                 return;
 
-            layoutTestController.dumpAsText();
+            testRunner.dumpAsText();
 
             var target = document.getElementById("target");
             var x = target.offsetParent.offsetLeft + target.offsetLeft + target.offsetWidth / 2;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search-delete-while-cancel-button-clicked.html b/third_party/WebKit/LayoutTests/fast/forms/search-delete-while-cancel-button-clicked.html
index 8407085..d668829 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search-delete-while-cancel-button-clicked.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search-delete-while-cancel-button-clicked.html
@@ -17,7 +17,7 @@
                 eventSender.mouseDown();
                 eventSender.mouseUp();
 
-                layoutTestController.notifyDone();
+                testRunner.notifyDone();
             }
             
             function deleteSearch()
@@ -32,11 +32,11 @@
             
             function drag()
             {
-                if (!window.layoutTestController)
+                if (!window.testRunner)
                     return;
 
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
 
                 var search = document.getElementById('search');
                 var x = search.offsetLeft + search.offsetWidth - 6;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search-disabled-readonly.html b/third_party/WebKit/LayoutTests/fast/forms/search-disabled-readonly.html
index 638323e..8e98706 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search-disabled-readonly.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search-disabled-readonly.html
@@ -35,7 +35,7 @@ function setInputAttributes(input, value, disabled, readonly) {
     input.readOnly = !!readonly;
 }
 
-if (window.layoutTestController) {
+if (window.testRunner) {
     var input = $("search_input");
     var cancelButtonPosition = searchCancelButtonPosition(input);
     var middleButtonPosition = {};
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search-event-delay.html b/third_party/WebKit/LayoutTests/fast/forms/search-event-delay.html
index 6139e7e..19dc4d3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search-event-delay.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search-event-delay.html
@@ -32,16 +32,16 @@ function searchEvent(event)
             sendDeleteKeyEvent();
         }
     } else {
-        if (window.layoutTestController)
-            setTimeout("layoutTestController.notifyDone()", 0); // Do it on a timer to avoid Windows DRT hanging.
+        if (window.testRunner)
+            setTimeout("testRunner.notifyDone()", 0); // Do it on a timer to avoid Windows DRT hanging.
     }
 }
 
 function startTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
     document.getElementById("search").focus();
     sendKeyEvent();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search-hidden-cancel-button.html b/third_party/WebKit/LayoutTests/fast/forms/search-hidden-cancel-button.html
index 4d80caf..af7ce43 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search-hidden-cancel-button.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search-hidden-cancel-button.html
@@ -10,8 +10,8 @@
             {
                 mouseDownCount = 0;
                 
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
 
                 var sf = document.getElementById("search");
 
@@ -20,7 +20,7 @@
 
                 var y = sf.offsetTop + sf.offsetHeight / 2;
 
-                if (window.layoutTestController) {
+                if (window.testRunner) {
                     eventSender.mouseMoveTo(buttonX, y);
                     eventSender.mouseDown();
                     eventSender.mouseUp();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search-placeholder-value-changed.html b/third_party/WebKit/LayoutTests/fast/forms/search-placeholder-value-changed.html
index 52dd3e1..8ca1f46 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search-placeholder-value-changed.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search-placeholder-value-changed.html
@@ -4,12 +4,12 @@ function delayedTest()
 {
     var searchField = document.getElementById("test");
     searchField.setAttribute("placeholder", "Test Passed");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 setTimeout(delayedTest, 100);
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search-transformed.html b/third_party/WebKit/LayoutTests/fast/forms/search-transformed.html
index 9f157a4..b93247c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search-transformed.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search-transformed.html
@@ -16,8 +16,8 @@
         Clicking the (x) button should clear the field.
     </p>
     <script>
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
         if (window.eventSender) {
             var target = document.getElementById("target");
             var translationAmount = 50;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search-zoomed.html b/third_party/WebKit/LayoutTests/fast/forms/search-zoomed.html
index b5e61f5..40d6245 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search-zoomed.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search-zoomed.html
@@ -21,8 +21,8 @@
         Clicking the (x) button should clear the field.
     </p>
     <script>
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
         if (window.eventSender) {
             var target = document.getElementById("target");
             var cancelPos = searchCancelButtonPosition(target);
diff --git a/third_party/WebKit/LayoutTests/fast/forms/search/search-shaking-text.html b/third_party/WebKit/LayoutTests/fast/forms/search/search-shaking-text.html
index fc6ff51..0e06b3d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/search/search-shaking-text.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/search/search-shaking-text.html
@@ -13,11 +13,11 @@
 function startTest() {
     document.getElementById('testField').offsetTop;
     document.getElementById('testField').style.width = '200px';
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-accesskey.html b/third_party/WebKit/LayoutTests/fast/forms/select-accesskey.html
index eb8ba8c..253ba99 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-accesskey.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-accesskey.html
@@ -15,7 +15,7 @@ FAIL
 </div>
 <script>
     if (window.eventSender) {
-        layoutTestController.dumpAsText();
+        testRunner.dumpAsText();
 
         var modifiers;
         if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-cache-desynchronization.html b/third_party/WebKit/LayoutTests/fast/forms/select-cache-desynchronization.html
index c8dfa3a..a4547ef 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-cache-desynchronization.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-cache-desynchronization.html
@@ -7,8 +7,8 @@
 var select = document.forms[0].elements[0];
 var res = document.getElementById("res");
 select.focus();
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
     eventSender.keyDown("downArrow", []);
     eventSender.keyDown("downArrow", ["shiftKey"]);
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-change-listbox-to-popup-roundtrip.html b/third_party/WebKit/LayoutTests/fast/forms/select-change-listbox-to-popup-roundtrip.html
index 9649378..4682033 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-change-listbox-to-popup-roundtrip.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-change-listbox-to-popup-roundtrip.html
@@ -1,9 +1,9 @@
 <html>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function runTest()
@@ -38,8 +38,8 @@ function reportResults()
         "<li>And neither should dropping out of the message loop: " + (selected3 == selected1 ? "PASS" : "FAIL") +
         "</ul>";
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-change-popup-to-listbox-in-event-handler.html b/third_party/WebKit/LayoutTests/fast/forms/select-change-popup-to-listbox-in-event-handler.html
index bb6aa41..a2722b3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-change-popup-to-listbox-in-event-handler.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-change-popup-to-listbox-in-event-handler.html
@@ -3,8 +3,8 @@
 <head>
   <title>Change popup to list inside mouse event handler.</title>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
 
     function sendClick()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-change-popup-to-listbox-roundtrip.html b/third_party/WebKit/LayoutTests/fast/forms/select-change-popup-to-listbox-roundtrip.html
index 9077df5..87db826 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-change-popup-to-listbox-roundtrip.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-change-popup-to-listbox-roundtrip.html
@@ -1,9 +1,9 @@
 <html>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function runTest()
@@ -38,8 +38,8 @@ function reportResults()
         "<li>And neither should dropping out of the message loop: " + (selected3 == selected1 ? "PASS" : "FAIL") +
         "</ul>";
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-dirty-parent-pref-widths.html b/third_party/WebKit/LayoutTests/fast/forms/select-dirty-parent-pref-widths.html
index bd2118b..18a79cb 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-dirty-parent-pref-widths.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-dirty-parent-pref-widths.html
@@ -5,13 +5,13 @@
       function go() {
         document.getElementById('sel1').style.display = '';
 
-        if (window.layoutTestController)
-            window.layoutTestController.notifyDone();
+        if (window.testRunner)
+            window.testRunner.notifyDone();
       }
 
       function main() {
-        if (window.layoutTestController)
-            window.layoutTestController.waitUntilDone();
+        if (window.testRunner)
+            window.testRunner.waitUntilDone();
         setTimeout(go, 0);
       }
     </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-double-onchange.html b/third_party/WebKit/LayoutTests/fast/forms/select-double-onchange.html
index 8fad87e..1051b92 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-double-onchange.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-double-onchange.html
@@ -9,7 +9,7 @@
                 if (!window.eventSender)
                     return;
 
-                layoutTestController.dumpAsText();
+                testRunner.dumpAsText();
 
                 var popup = document.getElementById("switcher");
                 popup.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-empty-list.html b/third_party/WebKit/LayoutTests/fast/forms/select-empty-list.html
index e8d9c19..95f98a2 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-empty-list.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-empty-list.html
@@ -2,8 +2,8 @@
 <script>
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     if (window.eventSender) {
         eventSender.mouseMoveTo(20, 70);
         eventSender.mouseDown();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-empty-optgroup.html b/third_party/WebKit/LayoutTests/fast/forms/select-empty-optgroup.html
index 057b1a5..c21a814 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-empty-optgroup.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-empty-optgroup.html
@@ -2,8 +2,8 @@
 <script>
 function submitForm()
 {
-    if (window.layoutTestController)
-        window.layoutTestController.dumpAsText();
+    if (window.testRunner)
+        window.testRunner.dumpAsText();
     document.getElementById("submitform").submit();
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-generated-content.html b/third_party/WebKit/LayoutTests/fast/forms/select-generated-content.html
index 2fb3686..92d47a2 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-generated-content.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-generated-content.html
@@ -12,8 +12,8 @@ function boom() {
     var s2 = document.createElement('select');
     s2.setAttribute('class', 's2');
     document.documentElement.appendChild(s2);
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 }
 window.onload = boom;
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-index-setter.html b/third_party/WebKit/LayoutTests/fast/forms/select-index-setter.html
index 6547632..c894708 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-index-setter.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-index-setter.html
@@ -3,8 +3,8 @@
         <script>
             function test()
             {
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
                 
                 var sl = document.getElementById('sl');
                 var no = new Option();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-list-box-mouse-focus.html b/third_party/WebKit/LayoutTests/fast/forms/select-list-box-mouse-focus.html
index 2baba59..5032650 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-list-box-mouse-focus.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-list-box-mouse-focus.html
@@ -1,8 +1,8 @@
 <script>
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var select = document.getElementById("select");
     var x = select.clientLeft + 10;
     var y = select.clientTop + 10;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-listbox-focus-displaynone.html b/third_party/WebKit/LayoutTests/fast/forms/select-listbox-focus-displaynone.html
index 41f8b1b..61341d5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-listbox-focus-displaynone.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-listbox-focus-displaynone.html
@@ -9,8 +9,8 @@
 <input id="selectable">
 
 <script>
-if (window.layoutTestController)
-    window.layoutTestController.dumpAsText();
+if (window.testRunner)
+    window.testRunner.dumpAsText();
 
 var selectable = document.getElementById('selectable');
 var multiselect = document.getElementById('multiselect');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-max-length.html b/third_party/WebKit/LayoutTests/fast/forms/select-max-length.html
index 8fdcffd..443cc51 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-max-length.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-max-length.html
@@ -3,8 +3,8 @@
 <select id="theSelect"></select>
 
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function log(msg)
     {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-namedItem.html b/third_party/WebKit/LayoutTests/fast/forms/select-namedItem.html
index f16ef92..d0fd233 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-namedItem.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-namedItem.html
@@ -26,8 +26,8 @@ function test()
             print("ERROR: " + e.message);
         }
     }
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 }
 </script>
 <title>Test for HTMLSelectElement.namedItem()</title>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-no-name.html b/third_party/WebKit/LayoutTests/fast/forms/select-no-name.html
index 6b679fc..4c3f8c0 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-no-name.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-no-name.html
@@ -27,9 +27,9 @@ SELECT with no name generates invalid query string.</p>
 <h2 id="pass">PASS</h2>
 <h2 id="fail">FAIL</h2>
 <script type="text/javascript">
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
 }
 
 function test() {
@@ -55,8 +55,8 @@ function test() {
         } 
         document.getElementById("pass").style.display = "inline-block";
     }
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 </script>
 <p>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-option-accesskey-crash.html b/third_party/WebKit/LayoutTests/fast/forms/select-option-accesskey-crash.html
index 2b619ef..6cdd35a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-option-accesskey-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-option-accesskey-crash.html
@@ -14,8 +14,8 @@
 <script>
 description('This test is to ensure that we do not crash when selecting an item from a menu list in a list box through an access key.')
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
 
     var selectElement = document.getElementById("target");
     selectElement.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-out-of-bounds-index.html b/third_party/WebKit/LayoutTests/fast/forms/select-out-of-bounds-index.html
index 6510ee8..e79e877 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-out-of-bounds-index.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-out-of-bounds-index.html
@@ -2,8 +2,8 @@
     <head>
         <script>
         function test() {
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
             var sl = document.getElementById('sl');
             sl.selectedIndex = 1;
             sl.selectedIndex = 2;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-popup-pagekeys.html b/third_party/WebKit/LayoutTests/fast/forms/select-popup-pagekeys.html
index 5145096..6828ab1 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-popup-pagekeys.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-popup-pagekeys.html
@@ -8,7 +8,7 @@
     }
     
     function sendKey(element, key) {
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             key = key.substr(0,1).toLowerCase() + key.substr(1); // lowercase 1st letter for eventSender
             eventSender.keyDown(key);
         } else {
@@ -173,8 +173,8 @@
     function test()
     {
         try{
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
             var passed = true;
             passed = testPageDownNoDisabledElements() && passed;
             passed = testPageUpNoDisabledElements() && passed;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-remove-option.html b/third_party/WebKit/LayoutTests/fast/forms/select-remove-option.html
index 299b21d..212de29 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-remove-option.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-remove-option.html
@@ -10,8 +10,8 @@ function test() {
 	var after = zipselect.options.length;
     if (before > after)
         document.getElementById("theDiv").innerHTML = "test passed"
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();  
+    if (window.testRunner)
+        testRunner.dumpAsText();  
 }

 </SCRIPT>

 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-replace-option.html b/third_party/WebKit/LayoutTests/fast/forms/select-replace-option.html
index 7814100..3eac996 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-replace-option.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-replace-option.html
@@ -2,8 +2,8 @@
 <script>
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var select = document.getElementById('select');
     select.options[1] = new Option("Replacement Option 1", "Replacement Option 1");
     var length = select.options.length;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection.html b/third_party/WebKit/LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection.html
index d82b918..e7a18ea 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection.html
@@ -11,8 +11,8 @@ function print(message)
 }

 function test()

 {

-    if (window.layoutTestController)

-        layoutTestController.dumpAsText();

+    if (window.testRunner)

+        testRunner.dumpAsText();

     selectElement = document.getElementById("select1");

     if (selectElement.value == "3")

         print("LOAD:SUCCEEDED!");

diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-reset.html b/third_party/WebKit/LayoutTests/fast/forms/select-reset.html
index 06c0a2c..9c46a56 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-reset.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-reset.html
@@ -2,8 +2,8 @@
 <script>
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var select = document.getElementById('select');
     var index = select.selectedIndex;
     document.forms[0].reset();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-script-onchange.html b/third_party/WebKit/LayoutTests/fast/forms/select-script-onchange.html
index 5f56044..e764587 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-script-onchange.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-script-onchange.html
@@ -10,7 +10,7 @@
                 if (!window.eventSender)
                     return;
 
-                layoutTestController.dumpAsText();
+                testRunner.dumpAsText();
 
                 var popup = document.getElementById("switcher1");
                 popup.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-set-inner.html b/third_party/WebKit/LayoutTests/fast/forms/select-set-inner.html
index 972a1dc..f30658b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-set-inner.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-set-inner.html
@@ -6,8 +6,8 @@
 
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     document.getElementById('select').length; // cause the <select> element to build a list of options
     document.getElementById('group').innerHTML = ""; // remove an option using innerHTML
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-type-ahead-list-box-no-selection.html b/third_party/WebKit/LayoutTests/fast/forms/select-type-ahead-list-box-no-selection.html
index db171eb..da23f8b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-type-ahead-list-box-no-selection.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-type-ahead-list-box-no-selection.html
@@ -11,8 +11,8 @@
 </select>
 <div id="result">To run interactively, tab to list and type "12" quickly. If it doesn't crash, the test passed.</div>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
         var menu = document.getElementById("list");
         menu.focus();
         eventSender.keyDown("1");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-type-ahead-non-latin.html b/third_party/WebKit/LayoutTests/fast/forms/select-type-ahead-non-latin.html
index db00179..1f31d9c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-type-ahead-non-latin.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-type-ahead-non-latin.html
@@ -5,8 +5,8 @@
 <select id="menu"><option>&#x05e9;</option><option>&#x05d3;</option><option>&#x05d2;</option><option>&#x05db;</option><option>&#x05e2;</option></select>
 <div id="result">Cannot run interactively.</div>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
         var menu = document.getElementById("menu");
         menu.focus();
         eventSender.keyDown("\u05d2");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-width-font-change.html b/third_party/WebKit/LayoutTests/fast/forms/select-width-font-change.html
index 94e75ef..a021d50 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-width-font-change.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-width-font-change.html
@@ -4,8 +4,8 @@
 
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var widthBefore = document.getElementById("select").offsetWidth;
     document.getElementById("select").setAttribute("style", "font-size: 32px");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select/listbox-in-multi-column.html b/third_party/WebKit/LayoutTests/fast/forms/select/listbox-in-multi-column.html
index 4fc63584..bba5990 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select/listbox-in-multi-column.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select/listbox-in-multi-column.html
@@ -75,10 +75,10 @@ function testIt(formIndex, colIndex, ofsX, expected)
 
 function test()
 {
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
 
-    layoutTestController.dumpAsText();
+    testRunner.dumpAsText();
 
     for (var formIndex = 0; formIndex < numForms; formIndex++) {
         for (var colIndex = 0; colIndex < numCols; colIndex++) {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select/menulist-popup-crash.html b/third_party/WebKit/LayoutTests/fast/forms/select/menulist-popup-crash.html
index 7560850..1ca0d9f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select/menulist-popup-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select/menulist-popup-crash.html
@@ -7,8 +7,8 @@
 <div id="console"></div>
 <p id="debug">PASS if the test didn't crash.</p>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var parent = document.createElement('div');
     parent.innerHTML = '<select id="sl1">'
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select/menulist-type-ahead-find.html b/third_party/WebKit/LayoutTests/fast/forms/select/menulist-type-ahead-find.html
index 09c59b1..bfe6e8f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select/menulist-type-ahead-find.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select/menulist-type-ahead-find.html
@@ -15,10 +15,10 @@ function testIt(ch, expected)
 
 function test()
 {
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
 
-    layoutTestController.dumpAsText();
+    testRunner.dumpAsText();
     testIt("c", "cherry");
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select/optgroup-clicking.html b/third_party/WebKit/LayoutTests/fast/forms/select/optgroup-clicking.html
index e3f5036..e60c532 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select/optgroup-clicking.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select/optgroup-clicking.html
@@ -48,12 +48,12 @@ window.jsTestIsAsync = true;
 
 function test()
 {
-    if (!window.layoutTestController) {
-        debug("This test needs layoutTestController.");
+    if (!window.testRunner) {
+        debug("This test needs testRunner.");
         return;
     }
 
-    layoutTestController.dumpAsText();
+    testRunner.dumpAsText();
 
     debug("\nClick enabled option");
     $("listbox").selectedIndex = 2;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/selected-index-assert.html b/third_party/WebKit/LayoutTests/fast/forms/selected-index-assert.html
index bfc0a5c..4af5de5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/selected-index-assert.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/selected-index-assert.html
@@ -6,7 +6,7 @@ No assertion failure (on a debug build) means test PASS.
 <select id="t">
 </select>
 <script type="text/javascript">
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     document.getElementById('t').selectedIndex;
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/selected-index-value.html b/third_party/WebKit/LayoutTests/fast/forms/selected-index-value.html
index 43c4ce1..52c4763 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/selected-index-value.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/selected-index-value.html
@@ -4,8 +4,8 @@
 See bug 798404. </p>
 
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function test(selected_value) {
 if (selected_value == 'C') {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/selection-functions.html b/third_party/WebKit/LayoutTests/fast/forms/selection-functions.html
index 68c8e7a..e256af5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/selection-functions.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/selection-functions.html
@@ -13,8 +13,8 @@
             }
             function test()
             {
-                if (window.layoutTestController) {
-                    layoutTestController.dumpAsText();
+                if (window.testRunner) {
+                    testRunner.dumpAsText();
                 }
                 var elt = document.getElementById("text");
                 print("===textarea===");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/slow-click.html b/third_party/WebKit/LayoutTests/fast/forms/slow-click.html
index 6bf49f3..46e20bf 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/slow-click.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/slow-click.html
@@ -2,8 +2,8 @@
 <body>
 Test that click() on checkboxes is not slow.<br><input type=checkbox id=cb>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
     
 var starttime = new Date().getTime();
 var cb = document.getElementById('cb');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/state-restore-hidden.html b/third_party/WebKit/LayoutTests/fast/forms/state-restore-hidden.html
index 90e4d4d..c9ba7f9 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/state-restore-hidden.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/state-restore-hidden.html
@@ -19,8 +19,8 @@ function runTest() {
     var state = document.getElementById("emptyOnFirstVisit");
     if (!state.value) {
         // First visit.
-        if (window.layoutTestController)
-            layoutTestController.waitUntilDone();
+        if (window.testRunner)
+            testRunner.waitUntilDone();
         state.value = "visited";
 
         document.f.hidden.value = "after";
@@ -35,8 +35,8 @@ function runTest() {
         script.src = "../js/resources/js-test-post.js";
         script.type = "text/javascript";
         script.onload = function() {
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
+            if (window.testRunner)
+                testRunner.notifyDone();
         };
         document.body.appendChild(script);
     }
diff --git a/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-autocomplete-form.html b/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-autocomplete-form.html
index 00f7895..8540dd93 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-autocomplete-form.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-autocomplete-form.html
@@ -29,8 +29,8 @@ function runTest()
     var state = document.getElementById('emptyOnFirstVisit');
     if (!state.value) {
         // First visit.
-        if (window.layoutTestController)
-            layoutTestController.waitUntilDone();
+        if (window.testRunner)
+            testRunner.waitUntilDone();
         state.value = 'visited';
     
         document.getElementById('input1').value = 'value1';
@@ -51,8 +51,8 @@ function runTest()
         shouldBe('document.getElementById("input2").value', '"value2"');
         shouldBe('document.getElementById("textarea2").value', '"good"');
         shouldBe('document.getElementById("select2").value', '"BSD"');
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
  }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html b/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html
index cab283f..e87a93b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html
@@ -33,8 +33,8 @@ function runTest()
     var state = document.getElementById('emptyOnFirstVisit');
     if (!state.value) {
         // First visit.
-        if (window.layoutTestController)
-            layoutTestController.waitUntilDone();
+        if (window.testRunner)
+            testRunner.waitUntilDone();
         state.value = 'visited';
         makeForm(parent, '1', '1', '1', '1', '1', '1', '1', '1', '1');
     
@@ -56,8 +56,8 @@ function runTest()
         shouldBe('document.getElementById("textarea").value', '"2"');
     
         parent.innerHTML = '';
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/state-save-of-detached-control.html b/third_party/WebKit/LayoutTests/fast/forms/state-save-of-detached-control.html
index a5830fa..e300e59 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/state-save-of-detached-control.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/state-save-of-detached-control.html
@@ -21,8 +21,8 @@ function runTest()
     var state = document.getElementById('emptyOnFirstVisit');
     if (!state.value) {
         // First visit.
-        if (window.layoutTestController)
-            layoutTestController.waitUntilDone();
+        if (window.testRunner)
+            testRunner.waitUntilDone();
         state.value = 'visited';
 
         form1.innerHTML = '<input name=user id=input1>';
@@ -35,8 +35,8 @@ function runTest()
         // Second visit.
         shouldBe('document.getElementById("input2").value', '""'); // Not 'value1'.
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
  }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/style-display-none.html b/third_party/WebKit/LayoutTests/fast/forms/style-display-none.html
index 9139fed..284fd1b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/style-display-none.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/style-display-none.html
@@ -3,8 +3,8 @@
  <p>This tests to see if 'style.display' for an element can be set dynamically.  See bug 820947. </p>
 
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 document.writeln("<div  id=\"result\"> \r\n  This test: FAILED </div>\r\n");
 document.writeln("<div  id=\"announce:Top\">\r\n This text should be hidden </div>\r\n");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/submit-change-fragment.html b/third_party/WebKit/LayoutTests/fast/forms/submit-change-fragment.html
index f055062..fcfb661 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/submit-change-fragment.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/submit-change-fragment.html
@@ -1,8 +1,8 @@
 <html>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 if (document.location.href.indexOf("n=v") == -1)
@@ -17,8 +17,8 @@ function runTest() {
 function hashChanged() {
     if (document.location.href.indexOf("firstaction") != -1) {
         document.getElementById("console").innerHTML="PASS";
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/submit-nil-value-field-assert.html b/third_party/WebKit/LayoutTests/fast/forms/submit-nil-value-field-assert.html
index 61000b3..83a153b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/submit-nil-value-field-assert.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/submit-nil-value-field-assert.html
@@ -7,14 +7,14 @@
 <form id="t"><input></form>
 <script>
     if (!location.href.match('\\?')) {
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
         }
         document.getElementById("t").submit();
     } else {
         document.getElementById("result").innerText = "PASS";
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/submit-to-blank-multiple-times.html b/third_party/WebKit/LayoutTests/fast/forms/submit-to-blank-multiple-times.html
index 8f500e3..6d82177 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/submit-to-blank-multiple-times.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/submit-to-blank-multiple-times.html
@@ -17,15 +17,15 @@
         </form>
         <div id="console"></div>
         <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.setCanOpenWindows();
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.setCanOpenWindows();
+            testRunner.waitUntilDone();
         }
         var numberTimesToClick = 2;
         var numberTimesToSpace = 2;
         window.onload = function() {
-            if (!window.layoutTestController || !window.eventSender)
+            if (!window.testRunner || !window.eventSender)
                 return;
             
             click();
@@ -65,8 +65,8 @@
             eventSender.keyDown(' ');
         }
         function notifyDone() {
-            layoutTestController.setCloseRemainingWindowsWhenComplete();
-            layoutTestController.notifyDone();
+            testRunner.setCloseRemainingWindowsWhenComplete();
+            testRunner.notifyDone();
         }
         </script>
     </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/submit-to-url-fragment.html b/third_party/WebKit/LayoutTests/fast/forms/submit-to-url-fragment.html
index e2cd87e..ac24b2a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/submit-to-url-fragment.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/submit-to-url-fragment.html
@@ -2,15 +2,15 @@
 <head>
 <title>Test for Bug 20038: REGRESSION (r35151): Can't post comments on flickr.com</title>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function runTest() {
     if (document.location.hash != "#preview") {
         document.getElementById("mysubmit").click();
-        setTimeout('if (window.layoutTestController) { layoutTestController.notifyDone(); }', 5000);
+        setTimeout('if (window.testRunner) { testRunner.notifyDone(); }', 5000);
     }
 }
 </script>
@@ -28,8 +28,8 @@ if (document.location.hash != "#preview") {
     document.write("FAIL");
 } else {
     document.write("PASS");
-    if (window.layoutTestController) {
-        layoutTestController.notifyDone();
+    if (window.testRunner) {
+        testRunner.notifyDone();
     }
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/submit-with-base.html b/third_party/WebKit/LayoutTests/fast/forms/submit-with-base.html
index 2152088..6194080 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/submit-with-base.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/submit-with-base.html
@@ -10,14 +10,14 @@
 <form id="t" action="" onsubmit="return true"><input name=a value=b></form>
 <script>
     if (!location.href.match('\\?')) {
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
         }
         document.getElementById("t").submit();
     } else {
         document.getElementById("result").innerHTML = "PASS";
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/tab-in-input.html b/third_party/WebKit/LayoutTests/fast/forms/tab-in-input.html
index 05084c5..01a635a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/tab-in-input.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/tab-in-input.html
@@ -1,12 +1,12 @@
 <script>
-	if (window.layoutTestController)
-	    window.layoutTestController.dumpAsText();
+	if (window.testRunner)
+	    window.testRunner.dumpAsText();
 </script>
 You should see "\tHello World" in the text field below<br />
 <input id="inputElem" type="text" value="	Hello World">
 <pre id="console"></pre>
 <script>
-	if (window.layoutTestController) {
+	if (window.testRunner) {
 		var inputElem = document.getElementById("inputElem");
 		document.getElementById("console").appendChild(document.createTextNode(inputElem.value));
 	}
diff --git a/third_party/WebKit/LayoutTests/fast/forms/tabs-with-modifiers.html b/third_party/WebKit/LayoutTests/fast/forms/tabs-with-modifiers.html
index 56588ab..1969c2c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/tabs-with-modifiers.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/tabs-with-modifiers.html
@@ -4,8 +4,8 @@
 
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(s)
 {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/targeted-frame-submission.html b/third_party/WebKit/LayoutTests/fast/forms/targeted-frame-submission.html
index f83963e..4567547 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/targeted-frame-submission.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/targeted-frame-submission.html
@@ -4,8 +4,8 @@
 
             function runTest()
             {
-                if (window.layoutTestController)
-                    layoutTestController.waitUntilDone();
+                if (window.testRunner)
+                    testRunner.waitUntilDone();
 
                 // Not dumping as text since the DumpRenderTree does not dump the text content of child frames.                
                 var button = document.getElementById('blankButton');
@@ -16,8 +16,8 @@
             {
                 if (document.getElementsByTagName('iframe')[0].contentDocument.URL == "about:blank")
                     return;
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
 
         </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/text-control-select-blurred.html b/third_party/WebKit/LayoutTests/fast/forms/text-control-select-blurred.html
index 6bb5815..ef1b73f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/text-control-select-blurred.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/text-control-select-blurred.html
@@ -3,8 +3,8 @@
 <input value="This is dummy text. This is dummy text">
 <pre id="logger"></pre>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function assert(property, actual, expected)
 {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/text-control-selection-crash.html b/third_party/WebKit/LayoutTests/fast/forms/text-control-selection-crash.html
index 77843a1..bff17f6b 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/text-control-selection-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/text-control-selection-crash.html
@@ -4,8 +4,8 @@ Test passes if it does not crash.
 <textarea id="A"></textarea>

 <textarea id="B"></textarea>

 <script>

-if (window.layoutTestController)

-    layoutTestController.dumpAsText();

+if (window.testRunner)

+    testRunner.dumpAsText();

 

 A.selectionStart = 0;

 B.style.display = "none";

diff --git a/third_party/WebKit/LayoutTests/fast/forms/text-field-setvalue-crash.html b/third_party/WebKit/LayoutTests/fast/forms/text-field-setvalue-crash.html
index 74edc0f..a5fa414 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/text-field-setvalue-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/text-field-setvalue-crash.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function test()
 {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/text-input-event.html b/third_party/WebKit/LayoutTests/fast/forms/text-input-event.html
index ddd3bd7..8f7c6b8 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/text-input-event.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/text-input-event.html
@@ -20,8 +20,8 @@ function typeInto(element, value)
 
 function runTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     logDiv = document.getElementById('log');
     var input = document.getElementsByTagName('input')[0];
diff --git a/third_party/WebKit/LayoutTests/fast/forms/text-set-value-crash.html b/third_party/WebKit/LayoutTests/fast/forms/text-set-value-crash.html
index d378521..a87b985 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/text-set-value-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/text-set-value-crash.html
@@ -17,8 +17,8 @@
         <input id="u" value="Lorem ipsum">
     </div>
     <script>
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
     
         var t = document.getElementById("t");
         var q = document.getElementById("q");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-and-mutation-events.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-and-mutation-events.html
index de31f23..a666b81 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-and-mutation-events.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-and-mutation-events.html
@@ -7,8 +7,8 @@
 </style>
 <script>
 
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function runTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-appearance-wrap.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-appearance-wrap.html
index 589ac1f..f45d4fe7 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-appearance-wrap.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-appearance-wrap.html
@@ -17,9 +17,9 @@ function log(msg) {
     document.getElementById('res').innerHTML = document.getElementById('res').innerHTML + msg + "<br>";
 }
     
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var unescapedLineWrap = unescape("%0D%0A");
@@ -59,8 +59,8 @@ if (document.URL.substring(0, 4) == "file") {
         assertLineWrap("wrap=hard mixed rtl and ltr text", urlString.substring(index5, index6 - 1), true);
         assertLineWrap("wrap=hard visibility:hidden", urlString.substring(index6, index7 - 1), true);
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
 } else {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-arrow-navigation.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-arrow-navigation.html
index 99547ea..eeff6c2 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-arrow-navigation.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-arrow-navigation.html
@@ -12,8 +12,8 @@ function log(str)
 
 function runTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     if (!window.eventSender)
         return;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-crlf.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-crlf.html
index fb4cc48..dd31b40 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-crlf.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-crlf.html
@@ -9,8 +9,8 @@
             }
             function test()
             {
-                if (window.layoutTestController) {
-                    layoutTestController.dumpAsText();
+                if (window.testRunner) {
+                    testRunner.dumpAsText();
                 }
                 var elt = document.getElementById("text");
                 elt.value = "This\ris\ra\rtest";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-default-value-leading-newline.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-default-value-leading-newline.html
index 4a4bd9c..65ed865 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-default-value-leading-newline.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-default-value-leading-newline.html
@@ -9,8 +9,8 @@
             }
             function test()
             {
-                if (window.layoutTestController) {
-                    layoutTestController.dumpAsText();
+                if (window.testRunner) {
+                    testRunner.dumpAsText();
                 }
                 var elt = document.getElementById("text");
                 elt.defaultValue = "\ntesting";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-hard-linewrap-empty.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-hard-linewrap-empty.html
index e344232..85cfefb 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-hard-linewrap-empty.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-hard-linewrap-empty.html
@@ -10,9 +10,9 @@ Bug 9537 REGRESSION: Reproducible crash in WebCore::RenderTextField::textWithHar
 <input type="submit">
 </form>
 <script>
-if (window.layoutTestController) {
-    window.layoutTestController.dumpAsText();
-    window.layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    window.testRunner.dumpAsText();
+    window.testRunner.waitUntilDone();
 }
 
 if (document.URL.indexOf('?') == -1) {
@@ -24,8 +24,8 @@ if (document.URL.indexOf('?') == -1) {
     else
         document.write("<div>Failure.</div><div>Expected: textarea=</div><div>Actual: " + formData + "</div>");
 
-    if (window.layoutTestController)
-        window.layoutTestController.notifyDone();
+    if (window.testRunner)
+        window.testRunner.notifyDone();
 }
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-linewrap-dynamic.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-linewrap-dynamic.html
index 0b3ca4b..982b31d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-linewrap-dynamic.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-linewrap-dynamic.html
@@ -7,9 +7,9 @@
 </form>
 <script>
 if (document.URL.indexOf('?') == -1) {
-    if (window.layoutTestController) {
-        window.layoutTestController.dumpAsText();
-        window.layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        window.testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
     }
     document.getElementById("textarea").removeAttribute("wrap");
     document.f.submit();
@@ -19,8 +19,8 @@ if (document.URL.indexOf('?') == -1) {
         document.write("Success");
     else
         document.write("Failure.  The form data that should have been submitted: textarea=123456789<br>This is what was actually submitted: " + formData);    
-    if (window.layoutTestController)
-        window.layoutTestController.notifyDone();
+    if (window.testRunner)
+        window.testRunner.notifyDone();
 }
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-no-scroll-on-blur.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-no-scroll-on-blur.html
index 3beb072..f80ec90 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-no-scroll-on-blur.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-no-scroll-on-blur.html
@@ -2,8 +2,8 @@
 <head>
 <script>
     function test() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         var ta = document.getElementById('ta');
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-node-removed-from-document-crash.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-node-removed-from-document-crash.html
index 32f5842..cab0153 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-node-removed-from-document-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-node-removed-from-document-crash.html
@@ -1,9 +1,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xht="http://www.w3.org/1999/xhtml">

     <script type="text/javascript">

-        if (window.layoutTestController)

+        if (window.testRunner)

         {

-            layoutTestController.dumpAsText();

-            layoutTestController.waitUntilDone();

+            testRunner.dumpAsText();

+            testRunner.waitUntilDone();

         }

         

         function runTest()

@@ -11,8 +11,8 @@
             var elements = document.getElementsByTagNameNS('http://www.w3.org/1999/xhtml','html');

             elements[0].textContent = "PASS";

             

-            if (window.layoutTestController)

-                layoutTestController.notifyDone();

+            if (window.testRunner)

+                testRunner.notifyDone();

         }

     </script> 

     <xht:object>

diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-paste-newline.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-paste-newline.html
index cc8204e..8a52a9d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-paste-newline.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-paste-newline.html
@@ -1,8 +1,8 @@
 <script>
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var ta = document.getElementById("ta");
     ta.value = "abc\n";
     ta.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-placeholder-relayout-assertion.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-placeholder-relayout-assertion.html
index ff324d5..71cf2399d 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-placeholder-relayout-assertion.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-placeholder-relayout-assertion.html
@@ -1,14 +1,14 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
 }
 
 function removeTextArea() {
     var child = document.getElementById('test');
     child.parentNode.removeChild(child);
-    if (window.layoutTestController) {
-        setTimeout("layoutTestController.notifyDone();", 0);
+    if (window.testRunner) {
+        setTimeout("testRunner.notifyDone();", 0);
     }
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-placeholder-set-attribute.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-placeholder-set-attribute.html
index c97cb1d..eac5d7a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-placeholder-set-attribute.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-placeholder-set-attribute.html
@@ -3,14 +3,14 @@
 function finishTest()
 {
     document.getElementById('textarea').setAttribute('placeholder','Placeholder');
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
     setTimeout(finishTest, 0);
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-scrollbar-height.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-scrollbar-height.html
index 74fe6b3..99f53f5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-scrollbar-height.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-scrollbar-height.html
@@ -7,8 +7,8 @@ li {overflow:auto;}
 </style>
 
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function checkForVerticalScrollbar() {
   var actual_height = document.getElementById('list_item').clientHeight;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-scrolled-endline-caret.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-scrolled-endline-caret.html
index 11e03f7..734cdcb 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-scrolled-endline-caret.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-scrolled-endline-caret.html
@@ -2,8 +2,8 @@
 <script>
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var ta = document.getElementById('ta')
     var res = document.getElementById('res');
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-setvalue-submit.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-setvalue-submit.html
index 3af8029..23f8b86 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-setvalue-submit.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-setvalue-submit.html
@@ -12,9 +12,9 @@
 
 if (document.URL.indexOf('?') == -1) {
 
-    if (window.layoutTestController) {
-        window.layoutTestController.dumpAsText();
-        window.layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        window.testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
     }
     
     var textarea1 = document.getElementById("textarea1");
@@ -32,8 +32,8 @@ if (document.URL.indexOf('?') == -1) {
     else
         document.write("Failure.  The value set in the textarea via javascript wasn't sent when the form was submitted.  Expected: " + expected + ", Found: " + formData);
     
-    if (window.layoutTestController)
-        window.layoutTestController.notifyDone();
+    if (window.testRunner)
+        window.testRunner.notifyDone();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-setvalue-without-renderer.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-setvalue-without-renderer.html
index aef2bce..c395510 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-setvalue-without-renderer.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-setvalue-without-renderer.html
@@ -8,8 +8,8 @@ function print(message) {
 }
 
 function test() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
     }
 
     var e = document.createElement("textarea");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-submit-crash.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-submit-crash.html
index 4102137..939cdac 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-submit-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-submit-crash.html
@@ -12,9 +12,9 @@ function log(s) {
 
 (function () {    
     if (document.URL.indexOf('?') == -1) {
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
         }
 
         document.getElementById("textarea").style.display = "none";
@@ -25,7 +25,7 @@ function log(s) {
     log("PASS: You didn't crash.");
     log("Submitted form value: " + location.search);
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 })();
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-trailing-newline.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-trailing-newline.html
index 1f4373a..9357342 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-trailing-newline.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-trailing-newline.html
@@ -1,8 +1,8 @@
 <script>
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var ta = document.getElementById("ta");
     ta.focus();
     document.execCommand("InsertLineBreak");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea-type-spaces.html b/third_party/WebKit/LayoutTests/fast/forms/textarea-type-spaces.html
index 91db322..6212c02 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea-type-spaces.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea-type-spaces.html
@@ -1,7 +1,7 @@
 <p><textarea id="ta"></textarea></p>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 var ta = document.getElementById("ta");
 ta.focus();
 if (window.eventSender) {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order.html b/third_party/WebKit/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order.html
index 8aa6c25..d0790c6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order.html
@@ -2,8 +2,8 @@
 <body>
 <script>
 // We don't care a render tree of this test.
-if (window.layoutTestController)
-    layoutTestController.dumpAsText(true);
+if (window.testRunner)
+    testRunner.dumpAsText(true);
 </script>
 <style>
 textarea {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textfield-drag-into-disabled.html b/third_party/WebKit/LayoutTests/fast/forms/textfield-drag-into-disabled.html
index 5e73744..4d22ae5 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textfield-drag-into-disabled.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textfield-drag-into-disabled.html
@@ -17,7 +17,7 @@ var fieldY = field.offsetTop + field.offsetHeight / 2;
 
 window.getSelection().setBaseAndExtent(text, 0, text, 1);
 
-if (window.layoutTestController) {
+if (window.testRunner) {
     eventSender.mouseMoveTo(textX, textY);
     eventSender.mouseDown();
     // leap forward so mouseDown will kick off a drag instead of starting a new selection.
@@ -26,7 +26,7 @@ if (window.layoutTestController) {
     eventSender.mouseMoveTo(fieldX, fieldY);
     eventSender.mouseUp();
 
-    layoutTestController.dumpAsText();
+    testRunner.dumpAsText();
     var resultText = "FAIL"
     if (!field.value)
         resultText = "PASS -- http://bugs.webkit.org/show_bug.cgi?id=10177";
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textfield-focus-out.html b/third_party/WebKit/LayoutTests/fast/forms/textfield-focus-out.html
index 4474e7d..2dbe4e0 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textfield-focus-out.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textfield-focus-out.html
@@ -9,8 +9,8 @@ function log(message) {
 }
 
 function runTest() {
-    if (window.layoutTestController)
-        window.layoutTestController.dumpAsText();
+    if (window.testRunner)
+        window.testRunner.dumpAsText();
         
     var field1 = document.getElementById("field1");
     var field2 = document.getElementById("field2");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textfield-inside-anchor.html b/third_party/WebKit/LayoutTests/fast/forms/textfield-inside-anchor.html
index 94f758b..a10a49a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textfield-inside-anchor.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textfield-inside-anchor.html
@@ -7,8 +7,8 @@
             }
             function test()
             {
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
 
                 var tf = document.getElementById('tf');
                 if (window.eventSender) {
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textfield-lastchange-was-useredit.html b/third_party/WebKit/LayoutTests/fast/forms/textfield-lastchange-was-useredit.html
index 775994e..4cf521f 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textfield-lastchange-was-useredit.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textfield-lastchange-was-useredit.html
@@ -10,7 +10,7 @@ HTMLTextAreaElement.lastChangeWasUserEdit, which are exposed via WebKit API.</p>
 <input type="text"><textarea></textarea>
 <script>
 
-if (!window.layoutTestController || !window.internals)
+if (!window.testRunner || !window.internals)
     testFailed('This test requires access to window.internals');
 
 var textField;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textfield-no-linebreak.html b/third_party/WebKit/LayoutTests/fast/forms/textfield-no-linebreak.html
index f8ec3dd..4ab0776 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textfield-no-linebreak.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textfield-no-linebreak.html
@@ -8,7 +8,7 @@ onkeypress = function(e) {
 }
 
 onload = function() {
-    if (window.layoutTestController)
+    if (window.testRunner)
         eventSender.keyDown("\n");
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textfield-onchange-deletion.html b/third_party/WebKit/LayoutTests/fast/forms/textfield-onchange-deletion.html
index 8aba54f..f2f7bc1 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textfield-onchange-deletion.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textfield-onchange-deletion.html
@@ -1,9 +1,9 @@
 <html>

 <script>

     function test() {

-        if (window.layoutTestController) {

-            layoutTestController.dumpAsText();

-            layoutTestController.waitUntilDone();

+        if (window.testRunner) {

+            testRunner.dumpAsText();

+            testRunner.waitUntilDone();

         }

         setTimeout(test2, 0);

     }

@@ -11,8 +11,8 @@
         document.getElementById('tf').focus();

         eventSender.keyDown('a');

         eventSender.keyDown("\r", null);

-        if (window.layoutTestController)

-            layoutTestController.notifyDone();

+        if (window.testRunner)

+            testRunner.notifyDone();

     }

     function test3()

     {

diff --git a/third_party/WebKit/LayoutTests/fast/forms/textfield-outline.html b/third_party/WebKit/LayoutTests/fast/forms/textfield-outline.html
index 935467d..38dc7c6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textfield-outline.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textfield-outline.html
@@ -5,7 +5,7 @@
         {
             var tf = document.getElementById('tf');
             tf.focus();
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 eventSender.keyDown("a");
                 eventSender.keyDown("b");
                 eventSender.keyDown("c");
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textfield-to-password-on-focus.html b/third_party/WebKit/LayoutTests/fast/forms/textfield-to-password-on-focus.html
index edc1f5d..9022b11 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textfield-to-password-on-focus.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textfield-to-password-on-focus.html
@@ -3,9 +3,9 @@
 <head>
 <script src="../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    window.layoutTestController.waitUntilDone();
-    window.layoutTestController.dumpAsText();
+if (window.testRunner) {
+    window.testRunner.waitUntilDone();
+    window.testRunner.dumpAsText();
 }
 
 function changeToPasswordField(textField)
@@ -15,7 +15,7 @@ function changeToPasswordField(textField)
 
 function test()
 {
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         var field = document.getElementById("field").focus();
 
         eventSender.keyDown("p");
@@ -26,7 +26,7 @@ function test()
         shouldBe('field.value', "'pass'");
         isSuccessfullyParsed();
 
-        window.layoutTestController.notifyDone();
+        window.testRunner.notifyDone();
     }
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textinput-not-fired-on-enter-in-input.html b/third_party/WebKit/LayoutTests/fast/forms/textinput-not-fired-on-enter-in-input.html
index a62b607..421bbd3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textinput-not-fired-on-enter-in-input.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/textinput-not-fired-on-enter-in-input.html
@@ -40,14 +40,14 @@ form.addEventListener('submit', function(event) {
     event.preventDefault();
 });
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 el.focus();
 if (window.eventSender) {
     log('\nSending Enter to input element');
     eventSender.keyDown('\r', []);
-} else if (window.layoutTestController)
+} else if (window.testRunner)
     log('This test requires eventSender to run in LayoutTests.');
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/type-after-focus-rule-shrink-width.html b/third_party/WebKit/LayoutTests/fast/forms/type-after-focus-rule-shrink-width.html
index 20cf3c4..21afb09 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/type-after-focus-rule-shrink-width.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/type-after-focus-rule-shrink-width.html
@@ -20,18 +20,18 @@ var input = document.getElementsByTagName('input')[0];
 function typeText() {
     document.execCommand('SelectAll', false, null);
     document.execCommand('InsertText', false, 'PASS');
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         input.parentNode.innerHTML = input.value;
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     }
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
     if (!window.eventSender)
         document.write('This test requires eventSender');
     else {
-        layoutTestController.waitUntilDone();
+        testRunner.waitUntilDone();
 
         eventSender.mouseMoveTo(input.offsetLeft + input.offsetWidth * 2 / 3, input.offsetTop + input.offsetHeight / 2);
         eventSender.mouseDown();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/update-from-element-during-editing-crash-1.html b/third_party/WebKit/LayoutTests/fast/forms/update-from-element-during-editing-crash-1.html
index dd73539..1bdec03 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/update-from-element-during-editing-crash-1.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/update-from-element-during-editing-crash-1.html
@@ -7,8 +7,8 @@
 <p id="container"><textarea></textarea></p>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var textarea = document.getElementsByTagName('textarea')[0];
 textarea.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/update-from-element-during-editing-crash-2.html b/third_party/WebKit/LayoutTests/fast/forms/update-from-element-during-editing-crash-2.html
index 82ef7d0..2e717b2 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/update-from-element-during-editing-crash-2.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/update-from-element-during-editing-crash-2.html
@@ -8,8 +8,8 @@ div + * {}
 </textarea></p>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var textarea = document.getElementsByTagName('textarea')[0];
 textarea.focus();
diff --git a/third_party/WebKit/LayoutTests/fast/forms/validation-message-appearance.html b/third_party/WebKit/LayoutTests/fast/forms/validation-message-appearance.html
index cea1e66..6082412 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/validation-message-appearance.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/validation-message-appearance.html
@@ -14,9 +14,9 @@
 
 <script>
 document.getElementById('submit').click();
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    setTimeout(function() { layoutTestController.notifyDone(); }, 10);
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    setTimeout(function() { testRunner.notifyDone(); }, 10);
 }
 </script>
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/validation-message-clone.html b/third_party/WebKit/LayoutTests/fast/forms/validation-message-clone.html
index 86667bc..71c0cb4 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/validation-message-clone.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/validation-message-clone.html
@@ -18,8 +18,8 @@ var lastInOriginalShadow;
 var lastInClonedShadow;
 $('submit').click();
 setTimeout(cloneElementWithValidationMessage, 0);
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 function cloneElementWithValidationMessage() {
     $('dest').appendChild(original.cloneNode());
@@ -27,14 +27,14 @@ function cloneElementWithValidationMessage() {
 }
 
 function confirmNoBubble() {
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         return;
 
     lastInOriginalShadow = internals.shadowRoot(original).lastChild;
     shouldBeTrue('internals.shadowPseudoId(lastInOriginalShadow) == "-webkit-validation-bubble"');
     lastInClonedShadow = internals.shadowRoot($('dest').firstChild).lastChild;
     shouldBeFalse('internals.shadowPseudoId(lastInClonedShadow) == "-webkit-validation-bubble"');
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 </script>
 
diff --git a/third_party/WebKit/LayoutTests/fast/forms/validation-message-in-relative-body.html b/third_party/WebKit/LayoutTests/fast/forms/validation-message-in-relative-body.html
index e5617e0..2819b21 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/validation-message-in-relative-body.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/validation-message-in-relative-body.html
@@ -37,7 +37,7 @@ var host = $('host');
 var hostRect;
 var bubbleRect;
 $('submit').click();
-if (window.layoutTestController) {
+if (window.testRunner) {
     setTimeout(check, 0);
 } else {
     debug('Submit the form, and check if the validation bubble is on the text field.');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-checkbox.html b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-checkbox.html
index 5ea31ab..81d2fe2 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-checkbox.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-checkbox.html
@@ -31,10 +31,10 @@ var host = $('host');
 var hostRect;
 var bubbleRect;
 $('submit').click();
-if (window.layoutTestController) {
+if (window.testRunner) {
     setTimeout(check, 0);
 } else {
-    debug('The test requires layoutTestController.');
+    debug('The test requires testRunner.');
 }
 
 var jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-listbox.html b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-listbox.html
index 1dba8ca..bd56c8e 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-listbox.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-listbox.html
@@ -30,10 +30,10 @@ var host = $('host');
 var hostRect;
 var bubbleRect;
 $('submit').click();
-if (window.layoutTestController) {
+if (window.testRunner) {
     setTimeout(check, 0);
 } else {
-    debug('The test requires layoutTestController.');
+    debug('The test requires testRunner.');
 }
 
 var jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-menulist.html b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-menulist.html
index b653b9b..51ff125 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-menulist.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-menulist.html
@@ -38,10 +38,10 @@ var hostRect;
 var bubbleRect;
 host.setCustomValidity('Testing a long validation message in order to check white-space:pre in the UA stylesheet does not affect to the validation message appearance.');
 $('submit').click();
-if (window.layoutTestController) {
+if (window.testRunner) {
     setTimeout(check, 0);
 } else {
-    debug('The test requires layoutTestController.');
+    debug('The test requires testRunner.');
 }
 
 var jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-radio.html b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-radio.html
index 27e1853..3404eff 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-radio.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-radio.html
@@ -27,10 +27,10 @@ var host = $('host');
 var hostRect;
 var bubbleRect;
 $('submit').click();
-if (window.layoutTestController) {
+if (window.testRunner) {
     setTimeout(check, 0);
 } else {
-    debug('The test requires layoutTestController.');
+    debug('The test requires testRunner.');
 }
 
 var jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-range.html b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-range.html
index 38ed714..2494e60 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-range.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-range.html
@@ -28,10 +28,10 @@ var hostRect;
 var bubbleRect;
 host.setCustomValidity('Invalid Value');
 $('submit').click();
-if (window.layoutTestController) {
+if (window.testRunner) {
     setTimeout(check, 0);
 } else {
-    debug('The test requires layoutTestController.');
+    debug('The test requires testRunner.');
 }
 
 var jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-textarea.html b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-textarea.html
index 6ba244a..7e9f4e3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-textarea.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/validation-message-on-textarea.html
@@ -29,10 +29,10 @@ var host = $('host');
 var hostRect;
 var bubbleRect;
 $('submit').click();
-if (window.layoutTestController) {
+if (window.testRunner) {
     setTimeout(check, 0);
 } else {
-    debug('The test requires layoutTestController.');
+    debug('The test requires testRunner.');
 }
 
 var jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/var-name-conflict-in-form-event-handler.html b/third_party/WebKit/LayoutTests/fast/forms/var-name-conflict-in-form-event-handler.html
index 77d3da6..9036db6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/var-name-conflict-in-form-event-handler.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/var-name-conflict-in-form-event-handler.html
@@ -13,8 +13,8 @@ takes precedence over items of form.
 <div id='sourceViewDiv'>This test: FAILED</div>
 
 <script>
-if (window.layoutTestController)
-  layoutTestController.dumpAsText();
+if (window.testRunner)
+  testRunner.dumpAsText();
 
 var x=document.getElementsByTagName('select')[0];
 x.options[2].selected=true;
diff --git a/third_party/WebKit/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit.html b/third_party/WebKit/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit.html
index 09c734e..5e579d6 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit.html
@@ -5,10 +5,10 @@
     <script>
     function test() {
         if (document.location.hash !== '#submitted') {
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.setXSSAuditorEnabled(true)
-                layoutTestController.waitUntilDone();
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.setXSSAuditorEnabled(true)
+                testRunner.waitUntilDone();
             }
 
             var form = document.getElementById('form');
@@ -16,8 +16,8 @@
             form.submit();
         } else {
             testPassed('No assertions raised.');
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
+            if (window.testRunner)
+                testRunner.notifyDone();
         }
     }
     </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/adopt-from-created-document.html b/third_party/WebKit/LayoutTests/fast/frames/adopt-from-created-document.html
index 1abc97b..2a9829b 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/adopt-from-created-document.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/adopt-from-created-document.html
@@ -1,7 +1,7 @@
 <body>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 alert(1);
 var doc = document.implementation.createDocument('http://www.w3.org/1999/xhtml', 'html', null); 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/adopt-iframe-into-itself.html b/third_party/WebKit/LayoutTests/fast/frames/adopt-iframe-into-itself.html
index f387c81..3c57746 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/adopt-iframe-into-itself.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/adopt-iframe-into-itself.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function test() {
     try {
diff --git a/third_party/WebKit/LayoutTests/fast/frames/assert-on-insertedIntoDocument.html b/third_party/WebKit/LayoutTests/fast/frames/assert-on-insertedIntoDocument.html
index eda9ce1..d7b2ae0 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/assert-on-insertedIntoDocument.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/assert-on-insertedIntoDocument.html
@@ -1,7 +1,7 @@
 <body>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var subtree = document.createElement('div');
 var styleElement = document.createElement('style');
diff --git a/third_party/WebKit/LayoutTests/fast/frames/cached-frame-counter.html b/third_party/WebKit/LayoutTests/fast/frames/cached-frame-counter.html
index 616c8c4..9588d28 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/cached-frame-counter.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/cached-frame-counter.html
@@ -1,9 +1,9 @@
 <body onload="setTimeout('test()', 500)">
 <p>Test that frame count limit is reset on navigations.</p>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function test()
@@ -16,8 +16,8 @@ function test()
         window.frames[100].document.documentElement.innerHTML;
     } catch (ex) {
         document.write("FAIL: " + ex + "<p>");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
         return;
     }
 
@@ -33,8 +33,8 @@ function test()
     while (ifr = document.getElementsByTagName("iframe")[0])
         document.body.removeChild(ifr);
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/content-opacity-2.html b/third_party/WebKit/LayoutTests/fast/frames/content-opacity-2.html
index d197d3b..ea6aad6 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/content-opacity-2.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/content-opacity-2.html
@@ -4,8 +4,8 @@
     <script>
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.waitUntilDone();
+            if (window.testRunner)
+                testRunner.waitUntilDone();
 
             setTimeout(function()
             {
@@ -14,8 +14,8 @@
                 link.setAttribute("rel", "stylesheet");
                 link.setAttribute("href", "data:text/css,/* This loads asynchronously */");
                 doc.documentElement.firstChild.appendChild(link);
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }, 100);
         }
     </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/contentWindow_Frame.html b/third_party/WebKit/LayoutTests/fast/frames/contentWindow_Frame.html
index 7b136c1..b67c846 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/contentWindow_Frame.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/contentWindow_Frame.html
@@ -2,9 +2,9 @@
 <head>
   <script>
     function putText() {
-      if (window.layoutTestController) {
-          layoutTestController.dumpAsText();
-          layoutTestController.dumpChildFramesAsText();
+      if (window.testRunner) {
+          testRunner.dumpAsText();
+          testRunner.dumpChildFramesAsText();
       }
       var t = document.getElementById("t_frame");
       var b = document.getElementById("b_frame");
diff --git a/third_party/WebKit/LayoutTests/fast/frames/contentWindow_iFrame.html b/third_party/WebKit/LayoutTests/fast/frames/contentWindow_iFrame.html
index 4d5fe8e..a09ff2e 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/contentWindow_iFrame.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/contentWindow_iFrame.html
@@ -2,8 +2,8 @@
 <head>
 <script>
     function putText() {
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
         }
         var w = document.getElementById("my_iframe").contentWindow;
         var d = document.getElementById("my_div");
diff --git a/third_party/WebKit/LayoutTests/fast/frames/crash-frameset-CSS-content-property.html b/third_party/WebKit/LayoutTests/fast/frames/crash-frameset-CSS-content-property.html
index b497b64..123b3d2 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/crash-frameset-CSS-content-property.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/crash-frameset-CSS-content-property.html
@@ -4,15 +4,15 @@
 <script>
 function runTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var frameset = document.getElementById("frameset");
     var mouseClick = document.createEvent("MouseEvent");
     mouseClick.initEvent("click", true, true);
     frameset.dispatchEvent(mouseClick);
 
-    if (!window.layoutTestController) {
+    if (!window.testRunner) {
         // For some reason, when running this test by hand in release builds you must manually
         // click on the not-found image placeholder to cause a crash. Hence, we don't replace
         // the <frameset> and print a PASS message.
diff --git a/third_party/WebKit/LayoutTests/fast/frames/crash-removed-iframe.html b/third_party/WebKit/LayoutTests/fast/frames/crash-removed-iframe.html
index 49fdb44..54fac05 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/crash-removed-iframe.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/crash-removed-iframe.html
@@ -36,8 +36,8 @@
     }
 
     function testCrash() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         testCrash1();
         testCrash2();
diff --git a/third_party/WebKit/LayoutTests/fast/frames/cross-site-this.html b/third_party/WebKit/LayoutTests/fast/frames/cross-site-this.html
index 040f4e6..13e8d9c 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/cross-site-this.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/cross-site-this.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 // The 'this' value provided to this method, and provided by this method to 'bar', should
 // both be the containing window object.
diff --git a/third_party/WebKit/LayoutTests/fast/frames/css-style-declaration-isolation.html b/third_party/WebKit/LayoutTests/fast/frames/css-style-declaration-isolation.html
index 6b9924d..779530e 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/css-style-declaration-isolation.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/css-style-declaration-isolation.html
@@ -4,8 +4,8 @@
 <div id="result"></div>
 
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 CSSStyleDeclaration.prototype.foo = "foo";
 var win = document.getElementById('ifr').contentWindow;
diff --git a/third_party/WebKit/LayoutTests/fast/frames/detached-frame-property.html b/third_party/WebKit/LayoutTests/fast/frames/detached-frame-property.html
index 69f6443..7f69873 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/detached-frame-property.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/detached-frame-property.html
@@ -1,7 +1,7 @@
 <p>Test that properties in a detached subframe become unavailable immediately.</p>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 onload = function()
 {
diff --git a/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload-2.html b/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload-2.html
index 732cc08..0424a6a 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload-2.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload-2.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 FAIL
 <iframe onload="document.close(); document.write('<p>PASS (1 of 2)<p>PASS (2 of 2)');"></iframe>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload-3.html b/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload-3.html
index 5311138..b37961e 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload-3.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload-3.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 FAIL
 <iframe onload="document.write('<p>PASS (1 of 2)<p>PASS (2 of 2)');"></iframe>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload.html b/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload.html
index 2669a84..71b7ed9 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/document-write-in-iframe-onload.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/empty-frame-document.html b/third_party/WebKit/LayoutTests/fast/frames/empty-frame-document.html
index 3dbb5e6..cdaba7b 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/empty-frame-document.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/empty-frame-document.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 </head>
 <body onload="window.frames[0].document">
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/crash-svg-document.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/crash-svg-document.html
index eb03ea1..e35e320 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/crash-svg-document.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/crash-svg-document.html
@@ -1,9 +1,9 @@
 <body>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.setFrameFlatteningEnabled(true);
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.setFrameFlatteningEnabled(true);
+    testRunner.dumpAsText();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html
index 7cf994e..074c938 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner)
+                testRunner.setFrameFlatteningEnabled(true);
             // Force synchronous layout.
             document.body.offsetHeight;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html
index 957c2ed..e220943 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
     function test()
     {
-        if (window.layoutTestController)
-            layoutTestController.setFrameFlatteningEnabled(true);
+        if (window.testRunner)
+            testRunner.setFrameFlatteningEnabled(true);
         // Force synchronous layout.
         document.body.offsetHeight;
     }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html
index 93eaa5e..35dab791 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html
@@ -1,16 +1,16 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
+        if (window.testRunner) {
+            testRunner.waitUntilDone();
+            testRunner.setFrameFlatteningEnabled(true);
         }
 
         function test()
         {
             setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }, 0);
         }
     </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html
index b706663..329da7b 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html
@@ -1,9 +1,9 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
+        if (window.testRunner) {
+            testRunner.waitUntilDone();
+            testRunner.setFrameFlatteningEnabled(true);
         }
 
         function test()
@@ -18,9 +18,9 @@
                 div.style.width='300';
                 div.style.backgroundColor='blue';
 
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 frames[0].document.body.offsetTop;
-                layoutTestController.notifyDone();
+                testRunner.notifyDone();
             }
         }
     </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html
index 723198c..8273ba7 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner)
+                testRunner.setFrameFlatteningEnabled(true);
             // Force synchronous layout.
             document.body.offsetHeight;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-crash.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-crash.html
index 02c0bbf..02b0b99 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-crash.html
@@ -1,10 +1,10 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
+            testRunner.setFrameFlatteningEnabled(true);
         }
     </script>
 </head>
@@ -17,10 +17,10 @@
     <script>
         function test2(){
             var i = document.getElementsByTagName('html')[0].clientWidth; 
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
-            if (window.layoutTestController)
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner)
+                testRunner.notifyDone();
+            if (window.testRunner)
+                testRunner.setFrameFlatteningEnabled(true);
         }
     </script>
     <body onresize='test2();'>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html
index 0237c78..cb62fd9 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner)
+                testRunner.setFrameFlatteningEnabled(true);
             // Force synchronous layout.
             document.body.offsetHeight;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html
index 880a9e5..3d16d0a 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html
@@ -4,9 +4,9 @@
 
         function test()
         {
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.setFrameFlatteningEnabled(true);
             }
         }
     </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html
index fb86714..99b95c8 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner)
+                testRunner.setFrameFlatteningEnabled(true);
             // Force synchronous layout.
             document.body.offsetHeight;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html
index 82c9f6f..aaf265f 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html
@@ -4,9 +4,9 @@
 
         function test()
         {
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.setFrameFlatteningEnabled(true);
             }
 
             // Force synchronous layout.
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height.html
index abdb672..13e9c86 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height.html
@@ -1,16 +1,16 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
+        if (window.testRunner) {
+            testRunner.waitUntilDone();
+            testRunner.setFrameFlatteningEnabled(true);
         }
 
         function test()
         {
             setTimeout(function() {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }, 0);
         }
     </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html
index a724797..beccf91 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner)
+                testRunner.setFrameFlatteningEnabled(true);
             // Force synchronous layout.
             document.body.offsetHeight;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html
index f0653ad..14a818a7 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html
@@ -9,8 +9,8 @@
     <script type="text/javascript">
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner)
+                testRunner.setFrameFlatteningEnabled(true);
             // Force synchronous layout.
             document.body.offsetHeight;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html
index a966513..e811094 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner)
+                testRunner.setFrameFlatteningEnabled(true);
             // Force synchronous layout.
             document.body.offsetHeight;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html
index ed611a8..092fd30 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html
@@ -1,17 +1,17 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
+        if (window.testRunner) {
+            testRunner.waitUntilDone();
+            testRunner.setFrameFlatteningEnabled(true);
         }
 
         function test()
         {
             setTimeout(function() {
                 scrollTo(1200, 0);
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }, 0);
         }
     </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html
index a99251c..900ab81d 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html
@@ -1,9 +1,9 @@
 <html>
 <head>
     <script type="text/javascript">
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.setFrameFlatteningEnabled(true);
+        if (window.testRunner) {
+            testRunner.waitUntilDone();
+            testRunner.setFrameFlatteningEnabled(true);
         }
 
         function test()
@@ -11,8 +11,8 @@
             setTimeout(function() {
                 scrollTo(1200, 0);
                 document.body.offsetWidth;
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }, 0);
         }
     </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html
index e245560..c466a72 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner)
+                testRunner.setFrameFlatteningEnabled(true);
             // Force synchronous layout.
             document.body.offsetHeight;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html
index 496100f..075181f 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html
@@ -2,9 +2,9 @@
 <head>
     <script type="text/javascript">
         function test() {
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.setFrameFlatteningEnabled(true);
             }
 
             // Force synchronous layout.
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html
index 6721bb4..d873f59 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.setFrameFlatteningEnabled(true);
+            if (window.testRunner)
+                testRunner.setFrameFlatteningEnabled(true);
             // Force synchronous layout.
             document.body.offsetHeight;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-tiny.html b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-tiny.html
index b7a4d0a..de83ec7 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-tiny.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/flattening/iframe-tiny.html
@@ -5,8 +5,8 @@
 <script>
 description("Test that frame flattening is not used for tiny frames. This test requires DRT or user agent with flattening enabled.");
 
-if (window.layoutTestController)
-    layoutTestController.setFrameFlatteningEnabled(true);
+if (window.testRunner)
+    testRunner.setFrameFlatteningEnabled(true);
 
 function checkResult(frameName, expectedWidth, expectedHeight)
 {
diff --git a/third_party/WebKit/LayoutTests/fast/frames/focus-controller-crash-change-event.html b/third_party/WebKit/LayoutTests/fast/frames/focus-controller-crash-change-event.html
index 126f0e6..a73eece 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/focus-controller-crash-change-event.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/focus-controller-crash-change-event.html
@@ -5,16 +5,16 @@
     <iframe></iframe>

 </div>

 <script>

-if (window.layoutTestController) {

-    layoutTestController.dumpAsText();

-	layoutTestController.waitUntilDone();

+if (window.testRunner) {

+    testRunner.dumpAsText();

+	testRunner.waitUntilDone();

 }

 

 a.addEventListener("change", function() { 

     b.innerHTML = "PASS";

 

-	if (window.layoutTestController)

-	    layoutTestController.notifyDone();

+	if (window.testRunner)

+	    testRunner.notifyDone();

 });

 

 a.addEventListener("keyup", function() {

@@ -26,7 +26,7 @@ a.addEventListener("keyup", function() {
 document.body.offsetTop;

 a.focus();

 

-if (window.layoutTestController)

+if (window.testRunner)

     eventSender.keyDown('a');

 </script>

 </html>
\ No newline at end of file
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-base-url.html b/third_party/WebKit/LayoutTests/fast/frames/frame-base-url.html
index 08da902..42fec0c 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-base-url.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-base-url.html
@@ -2,9 +2,9 @@
 <head>
 <title>Test for 13364</title>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
 }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-crash-with-page-cache.html b/third_party/WebKit/LayoutTests/fast/frames/frame-crash-with-page-cache.html
index 3621f24..1e149ff 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-crash-with-page-cache.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-crash-with-page-cache.html
@@ -2,8 +2,8 @@
 <script>
 window.finish = function()
 {
-    if (layoutTestController)
-        layoutTestController.notifyDone();
+    if (testRunner)
+        testRunner.notifyDone();
 }
 
 window.log = function(message) {
@@ -16,11 +16,11 @@ window.failure = function(message) {
 }
 
 function test() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
-        layoutTestController.setCanOpenWindows();
-        layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
+        testRunner.setCanOpenWindows();
+        testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
     }
     log("open page-1");
     window.open("resources/cached-page-1.html");
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-dead-region.html b/third_party/WebKit/LayoutTests/fast/frames/frame-dead-region.html
index 3e5f36e..a9623c9 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-dead-region.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-dead-region.html
@@ -3,8 +3,8 @@
     <head>
         <title>Frameset Dead Region Test</title>
         <script>
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
         </script>
     </head>
     <frameset cols="150,*">
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-deep-nested-resize.html b/third_party/WebKit/LayoutTests/fast/frames/frame-deep-nested-resize.html
index 095ad2c..1830c54 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-deep-nested-resize.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-deep-nested-resize.html
@@ -1,11 +1,11 @@
 <html>
     <head>
         <script>
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
 
             function log(frame, success, isWidth, size) {
-              if (window.layoutTestController) {
+              if (window.testRunner) {
                 alert(frame.name + ' resized correctly = ' + (success ? 'true' : 'false'));
               } else {
                 frame.document.close();
@@ -21,12 +21,12 @@
             }
 
             function checkProgress() {
-                if (!window.layoutTestController)
+                if (!window.testRunner)
                     checkSuccess();
             }
 
             function init() {
-                if (window.layoutTestController) {
+                if (window.testRunner) {
                     //Move the One/* vertical resizer ten pixels west...
                     eventSender.mouseMoveTo(90, 400);
                     eventSender.mouseDown();
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-display-none-focus.html b/third_party/WebKit/LayoutTests/fast/frames/frame-display-none-focus.html
index 94ce394..f3b8df8 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-display-none-focus.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-display-none-focus.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 This tests that trying to focus a frame that is display:none will not crash.<br>
 <iframe src="resources/iframe-focus.html" style="display: none"></iframe>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-element-name.html b/third_party/WebKit/LayoutTests/fast/frames/frame-element-name.html
index fba2cfd..22dd38e 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-element-name.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-element-name.html
@@ -1,15 +1,15 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpChildFramesAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpChildFramesAsText();
+    testRunner.waitUntilDone();
 }
 
 function framesLoaded()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-inherit-noresize-from-frameset.html b/third_party/WebKit/LayoutTests/fast/frames/frame-inherit-noresize-from-frameset.html
index 13e021c..7463438 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-inherit-noresize-from-frameset.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-inherit-noresize-from-frameset.html
@@ -3,9 +3,9 @@
 <head>
 <script src="resources/frame-programmatic-resize.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
 }
 
 window.onload = runTests;
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-js-url-clientWidth.html b/third_party/WebKit/LayoutTests/fast/frames/frame-js-url-clientWidth.html
index a4fd365..4ace48c 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-js-url-clientWidth.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-js-url-clientWidth.html
@@ -1,10 +1,10 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
     
 function log(s)
 {
-    if (window.layoutTestController)
+    if (window.testRunner)
         alert(s);
     else
         logger.document.write('<p>' + s + '</p>');
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-limit.html b/third_party/WebKit/LayoutTests/fast/frames/frame-limit.html
index 3ab5938..71164f5 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-limit.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-limit.html
@@ -13,8 +13,8 @@
 	}
 	
 	function runTest() {
-		if (window.layoutTestController)
-			layoutTestController.dumpAsText();
+		if (window.testRunner)
+			testRunner.dumpAsText();
 			
 		// Add 150 frames. 
 		addFrames();
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-name-reset.html b/third_party/WebKit/LayoutTests/fast/frames/frame-name-reset.html
index 79ff1e3..2b6616e 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-name-reset.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-name-reset.html
@@ -3,8 +3,8 @@
 <head>
         <title>Bug 7422</title>
         <script>
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
         </script>
 </head>
         <frameset cols="400,*" rows="*" id="mainFrameset">
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-programmatic-noresize.html b/third_party/WebKit/LayoutTests/fast/frames/frame-programmatic-noresize.html
index a7e2c3d..b94211b 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-programmatic-noresize.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-programmatic-noresize.html
@@ -3,9 +3,9 @@
 <head>
 <script src="resources/frame-programmatic-resize.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
 }
 
 window.onload = runTests;
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-set-same-location.html b/third_party/WebKit/LayoutTests/fast/frames/frame-set-same-location.html
index de60623..2c66327 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-set-same-location.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-set-same-location.html
@@ -4,8 +4,8 @@
 <head>
 <script>
     
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
     function rightFrameLoaded() {
         rightFrameLoadCount++;
@@ -13,15 +13,15 @@
             // Console is set by runTest
             console.firstChild.nodeValue = "SUCCESS";
             
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 // Put the test result in the main document so we can dump as text
                 var text = console.ownerDocument.documentElement.innerHTML;
                 document.open();
                 document.write(text);
                 document.close();
                 
-                layoutTestController.dumpAsText();
-                layoutTestController.notifyDone();
+                testRunner.dumpAsText();
+                testRunner.notifyDone();
             }
         }
     }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-set-same-src.html b/third_party/WebKit/LayoutTests/fast/frames/frame-set-same-src.html
index 39a081932..cffc54c 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-set-same-src.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-set-same-src.html
@@ -4,8 +4,8 @@
 <head>
 <script>
     
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
     function rightFrameLoaded() {
         rightFrameLoadCount++;
@@ -13,15 +13,15 @@
             // Console is set by runTest
             console.firstChild.nodeValue = "SUCCESS";
 
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 // Put the test result in the main document so we can dump as text
                 var text = console.ownerDocument.documentElement.innerHTML;
                 document.open();
                 document.write(text);
                 document.close();
 
-                layoutTestController.dumpAsText();
-                layoutTestController.notifyDone();
+                testRunner.dumpAsText();
+                testRunner.notifyDone();
             }
         }
     }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-src-attribute.html b/third_party/WebKit/LayoutTests/fast/frames/frame-src-attribute.html
index 54d8aeb..244c0d9 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-src-attribute.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-src-attribute.html
@@ -2,9 +2,9 @@
 <head>

 <script>

 

-if (window.layoutTestController) {

-    layoutTestController.dumpAsText();

-    layoutTestController.dumpChildFramesAsText();

+if (window.testRunner) {

+    testRunner.dumpAsText();

+    testRunner.dumpChildFramesAsText();

 }

 

 function write(s)

diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-unload-crash.html b/third_party/WebKit/LayoutTests/fast/frames/frame-unload-crash.html
index 32fa8c0..465ea0c 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-unload-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-unload-crash.html
@@ -2,15 +2,15 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
 }
 
 function done()
 {
     document.getElementById("results").appendChild(document.createTextNode("PASS"));
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-with-noresize-can-be-resized-after-removal-of-noresize.html b/third_party/WebKit/LayoutTests/fast/frames/frame-with-noresize-can-be-resized-after-removal-of-noresize.html
index 27a161b..a54f842 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-with-noresize-can-be-resized-after-removal-of-noresize.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-with-noresize-can-be-resized-after-removal-of-noresize.html
@@ -3,9 +3,9 @@
 <head>
 <script src="resources/frame-programmatic-resize.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
 }
 
 window.onload = runTests;
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-with-noresize-can-be-resized-after-setting-noResize-to-false.html b/third_party/WebKit/LayoutTests/fast/frames/frame-with-noresize-can-be-resized-after-setting-noResize-to-false.html
index 760573f9..0d466e3 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-with-noresize-can-be-resized-after-setting-noResize-to-false.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-with-noresize-can-be-resized-after-setting-noResize-to-false.html
@@ -3,9 +3,9 @@
 <head>
 <script src="resources/frame-programmatic-resize.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
 }
 
 window.onload = runTests;
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frameElement-widthheight.html b/third_party/WebKit/LayoutTests/fast/frames/frameElement-widthheight.html
index f52100d..ebace26 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frameElement-widthheight.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frameElement-widthheight.html
@@ -7,14 +7,14 @@
   <frame name="frame1" src="javascript:
     function log(s)
     {
-      if (window.layoutTestController)
+      if (window.testRunner)
         alert(s);
       else
         top.frame1.document.write('<p>' + s + '</p>');
     }
     
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
     
     top.frame1.document.write('<p>Test for the presence of frameElement.width and frameElement.height <a href=\'https://bugs.webkit.org/show_bug.cgi?id=6402\'>(bug 6402)</a></p>');
     
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frames-with-frameborder-zero-can-be-resized.html b/third_party/WebKit/LayoutTests/fast/frames/frames-with-frameborder-zero-can-be-resized.html
index 8d20935..2575b23 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frames-with-frameborder-zero-can-be-resized.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frames-with-frameborder-zero-can-be-resized.html
@@ -3,7 +3,7 @@
     <head>

         <script>

             function log(frame, success, isWidth, size) {

-                if (window.layoutTestController) {

+                if (window.testRunner) {

                     document.getElementById("results").contentDocument.getElementById("console").appendChild(document.createTextNode((success ? "PASS: " : "FAIL: ") + frame.name + " resized correctly\n"));

                 } else {

                     frame.document.close();

@@ -19,15 +19,15 @@
             }

 

             function checkProgress() {

-                if (!window.layoutTestController) {

+                if (!window.testRunner) {

                     checkSuccess();

                 }

             }

 

             function run() {

-                if (window.layoutTestController) {

-                    layoutTestController.dumpAsText();

-                    layoutTestController.dumpChildFramesAsText();

+                if (window.testRunner) {

+                    testRunner.dumpAsText();

+                    testRunner.dumpChildFramesAsText();

 

                     document.getElementById("results").contentDocument.getElementById("description").innerText = "\nThis tests that frames with frameborder=0 can be resized. See WebKit Bug 23750. On success, two 'PASS' messages will be shown below.";

 

diff --git a/third_party/WebKit/LayoutTests/fast/frames/frameset-style-recalc.html b/third_party/WebKit/LayoutTests/fast/frames/frameset-style-recalc.html
index b6ce5c8..f064996 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frameset-style-recalc.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frameset-style-recalc.html
@@ -3,14 +3,14 @@
     <script type="text/javascript">
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.waitUntilDone();
+            if (window.testRunner)
+                testRunner.waitUntilDone();
 
             document.body.offsetTop;
             setTimeout(function() {
                 document.body.rows = "200,*";
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }, 0);
         }
     </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/hover-timer-crash.html b/third_party/WebKit/LayoutTests/fast/frames/hover-timer-crash.html
index c4494ab..2b82289d 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/hover-timer-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/hover-timer-crash.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         function finish()
         {
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
+            if (window.testRunner)
+                testRunner.notifyDone();
         }
 
         function crash_step2()
@@ -17,9 +17,9 @@
 
         function test()
         {
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
                 var target = document.getElementById("target");
                 eventSender.mouseMoveTo(target.offsetLeft + target.offsetWidth / 2, target.offsetTop + target.offsetHeight / 2);
                 setTimeout(crash_step2, 100);
@@ -38,6 +38,6 @@
     <p>
         No crash means SUCCESS.
     </p>
-    <iframe onmouseover="if (!window.layoutTestController) setTimeout(crash_step2, 1000)" id="target" src="data:text/html,<body bgcolor='yellow'></body>" style="border: solid black"></iframe>
+    <iframe onmouseover="if (!window.testRunner) setTimeout(crash_step2, 1000)" id="target" src="data:text/html,<body bgcolor='yellow'></body>" style="border: solid black"></iframe>
 </body>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-access-screen-of-deleted.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-access-screen-of-deleted.html
index a592173..35f5733 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-access-screen-of-deleted.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-access-screen-of-deleted.html
@@ -14,8 +14,8 @@
     }
 
     function runTests() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
             
         var f = document.getElementById('theframe');
         var s = f.contentWindow.screen;
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-display-none.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-display-none.html
index 0a39676..09ef7cb 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-display-none.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-display-none.html
@@ -2,8 +2,8 @@
     <head>
         <script>
             function runTest() {
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
                     
                 var frame = document.getElementById('theFrame');
                 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-double-attach.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-double-attach.html
index 7d63f05..2dac3c9 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-double-attach.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-double-attach.html
@@ -7,8 +7,8 @@
     <script>
         function runTest()
         {
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
                 
             // first, make sure the target needs style recalc
             target.style.backgroundColor = "white";
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-double-scale-contents.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-double-scale-contents.html
index d2228ac..c4560e2 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-double-scale-contents.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-double-scale-contents.html
@@ -10,8 +10,8 @@
     <script>
       window.enablePixelTesting = true;
 
-      if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+      if (window.testRunner)
+        testRunner.waitUntilDone();
 
       // Layout for the iframe will be scaled down to a quarter.
       // It appears this bug will only manifest itself if layout for the
@@ -32,8 +32,8 @@
           // appear to be recalculated after this
           scalePage(1.0);
           document.body.offsetWidth;
-          if (window.layoutTestController)
-            layoutTestController.notifyDone();
+          if (window.testRunner)
+            testRunner.notifyDone();
       }
     </script>
     <script src="../js/resources/js-test-pre.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-js-url-clientWidth.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-js-url-clientWidth.html
index 751fd2d..c40b90a 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-js-url-clientWidth.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-js-url-clientWidth.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
     
 function log(s)
 {
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-name-and-id.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-name-and-id.html
index d77ea57..8f9f6e6 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-name-and-id.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-name-and-id.html
@@ -8,8 +8,8 @@ function print(message) {
 }
 
 function test() {
-        if (window.layoutTestController) {
-                window.layoutTestController.dumpAsText();
+        if (window.testRunner) {
+                window.testRunner.dumpAsText();
         }
         
         print("frames[0].name (should be frame0_name): " + frames[0].name);
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-no-src-local-origin-allow.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-no-src-local-origin-allow.html
index 6c9b6d2..833b0aa 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-no-src-local-origin-allow.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-no-src-local-origin-allow.html
@@ -2,9 +2,9 @@
 <head>
 <script src="../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var iframeHasLoadedFirstPage = false;
@@ -19,8 +19,8 @@ function runTest()
     innerFrame.onload = function() {
         shouldBe("document.getElementById('theFrame').contentDocument.getElementById('innerFrame').contentDocument.body.innerHTML", "'PASS\\n'");
         isSuccessfullyParsed();
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
     frameDoc.body.appendChild(innerFrame);
 }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-no-src-set-location.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-no-src-set-location.html
index b25753b..c052998 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-no-src-set-location.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-no-src-set-location.html
@@ -2,9 +2,9 @@
 <head>
 <script src="../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var iframeHasLoadedFirstPage = false;
@@ -22,8 +22,8 @@ function runTest()
 
         isSuccessfullyParsed();
 
-        if (window.layoutTestController) {
-            layoutTestController.notifyDone();
+        if (window.testRunner) {
+            testRunner.notifyDone();
         }
     }
 }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-onload-remove-self-no-crash.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-onload-remove-self-no-crash.html
index fca7d11..f1cdedc 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-onload-remove-self-no-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-onload-remove-self-no-crash.html
@@ -1,7 +1,7 @@
 <html>
 <script>
-if (window.layoutTestController)
-  layoutTestController.dumpAsText();
+if (window.testRunner)
+  testRunner.dumpAsText();
 </script>
 <script src="resources/iframe-onload-remove-self-no-crash.js"></script>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-option-crash.xhtml b/third_party/WebKit/LayoutTests/fast/frames/iframe-option-crash.xhtml
index 5b43769..e20684f 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-option-crash.xhtml
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-option-crash.xhtml
@@ -4,8 +4,8 @@
 <script>
 function test()
 {
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
     var frame = document.getElementsByTagName("iframe")[0];
     var body = document.getElementById("body");
@@ -14,8 +14,8 @@ function test()
 
     document.getElementById("result").appendChild(document.createTextNode("If no crash while painting, the test passed (requires pixel test mode)."));
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash.html
index 0765e9b..8d21a80 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash.html
@@ -1,18 +1,18 @@
 <html>

 <body onload="runTest()">

 <script>

-    if (window.layoutTestController)

+    if (window.testRunner)

     {

-        layoutTestController.dumpAsText();

-        layoutTestController.waitUntilDone();

+        testRunner.dumpAsText();

+        testRunner.waitUntilDone();

     }

     

     function runTest()

     {

         document.body.innerHTML = 'PASS';

         

-        if (layoutTestController)

-            layoutTestController.notifyDone();

+        if (testRunner)

+            testRunner.notifyDone();

     }

 </script>

 <iframe src="data:application/x-webkit-test-netscape,foo"></iframe>

diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-remove-after-id-change.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-remove-after-id-change.html
index 4f4adf7..42d3cdb 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-remove-after-id-change.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-remove-after-id-change.html
@@ -10,8 +10,8 @@ function log(s)
     document.getElementById("console").appendChild(document.createTextNode(s));
 }
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var iframe = document.getElementById("iframe");
 iframe.setAttribute("id", "iframe2", 0);
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-reparenting-unique-name.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-reparenting-unique-name.html
index 02b923c..8f8ebf6 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-reparenting-unique-name.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-reparenting-unique-name.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
 }
 
 function runTest()
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-scale-applied-twice.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-scale-applied-twice.html
index b091351..f2cddad 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-scale-applied-twice.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-scale-applied-twice.html
@@ -4,8 +4,8 @@
     <iframe id="target" style="width: 100px; height: 100px; border: none;"></iframe>
 </div>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
     var target = document.getElementById("target");
     document.body.offsetTop;
     document.getElementById("result").innerText = target.contentDocument.body.offsetWidth > 100 ? "FAIL" : "PASS";
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-scroll-page-up-down.html-disabled b/third_party/WebKit/LayoutTests/fast/frames/iframe-scroll-page-up-down.html-disabled
index c4cbc58..c3fd2c6 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-scroll-page-up-down.html-disabled
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-scroll-page-up-down.html-disabled
@@ -3,11 +3,11 @@
 <script>

 function test() 

 {

-    if (!window.layoutTestController)

+    if (!window.testRunner)

         return;

 

-    if (window.layoutTestController)

-        layoutTestController.dumpAsText();

+    if (window.testRunner)

+        testRunner.dumpAsText();

 

     // 1st test: iframes scrolled to top, top level document scrolled to bottom

     // pageup in innermost iframe should scroll top level document up

diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-scrolling-attribute-overflowscroll.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-scrolling-attribute-overflowscroll.html
index 7bbf716..52f54f4 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-scrolling-attribute-overflowscroll.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-scrolling-attribute-overflowscroll.html
@@ -42,8 +42,8 @@
             "PASSED" : 
             "FAILED: " + reportMismatch("frame1") + "; " + reportMismatch("frame2");
 
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
     }
     
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-set-inner-html.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-set-inner-html.html
index e7d800b..b64ba88 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-set-inner-html.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-set-inner-html.html
@@ -1,9 +1,9 @@
 <html>
 <script>
 function runTest() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.dumpChildFramesAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.dumpChildFramesAsText();
     }
     
     var c = document.getElementById('container');
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-set-same-location.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-set-same-location.html
index 0cce63f..c9863b4 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-set-same-location.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-set-same-location.html
@@ -10,7 +10,7 @@
             document.getElementById("anIFrame").contentWindow.location.href = "resources/purple.html";
         } else {
             document.getElementById("console").firstChild.nodeValue = "SUCCESS";
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
     
@@ -18,9 +18,9 @@
 </head>
 <body>
   <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
   </script>
 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-set-same-src.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-set-same-src.html
index d11d38c..c795792 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-set-same-src.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-set-same-src.html
@@ -10,7 +10,7 @@
             document.getElementById("anIFrame").src = "resources/purple.html";
         } else {
             document.getElementById("console").firstChild.nodeValue = "SUCCESS";
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
     
@@ -18,9 +18,9 @@
 </head>
 <body>
   <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
   </script>
 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-target.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-target.html
index 8fbcfe5..87433e6 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-target.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-target.html
@@ -2,8 +2,8 @@
 <head>
     <script>
     function runTests() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
             
         var l = document.getElementById('theform');
         l.submit()
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-window-focus.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-window-focus.html
index ca2da58..7cea921 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-window-focus.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-window-focus.html
@@ -1,8 +1,8 @@
 <html>
     <head>
         <script>
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
 
             function moveFocus() {
                 var ifrm = document.getElementById("rte");
@@ -14,7 +14,7 @@
                 ifrm.contentDocument.designMode = "on";
                 ifrm.contentWindow.focus();
                 
-                if (window.layoutTestController) {
+                if (window.testRunner) {
                     eventSender.keyDown('T');
                     eventSender.keyDown('E');
                     eventSender.keyDown('S');
diff --git a/third_party/WebKit/LayoutTests/fast/frames/inline-object-inside-frameset.html b/third_party/WebKit/LayoutTests/fast/frames/inline-object-inside-frameset.html
index a99f75af..62ebbae 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/inline-object-inside-frameset.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/inline-object-inside-frameset.html
@@ -10,8 +10,8 @@ function runTest() {
     
     dcont.appendChild(e);
     
-    if (window.layoutTestController)
-        layoutTestController.display();
+    if (window.testRunner)
+        testRunner.display();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/javascript-url-as-framesrc-crash.html b/third_party/WebKit/LayoutTests/fast/frames/javascript-url-as-framesrc-crash.html
index a0da5be..fdd8967 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/javascript-url-as-framesrc-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/javascript-url-as-framesrc-crash.html
@@ -2,8 +2,8 @@
 <script language="JavaScript">

 // See https://bugs.webkit.org/show_bug.cgi?id=26230

 

-if (window.layoutTestController) {

-    layoutTestController.dumpAsText();

+if (window.testRunner) {

+    testRunner.dumpAsText();

 }

 

 function makeFrameContents() {

diff --git a/third_party/WebKit/LayoutTests/fast/frames/javascript-url-for-deleted-frame.html b/third_party/WebKit/LayoutTests/fast/frames/javascript-url-for-deleted-frame.html
index d827463..a63c028 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/javascript-url-for-deleted-frame.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/javascript-url-for-deleted-frame.html
@@ -1,7 +1,7 @@
 <body>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var ifr = document.createElement('iframe');
 ifr.setAttribute('src', 'javascript:parent.boom(), "<div>Crash?</div>"');
diff --git a/third_party/WebKit/LayoutTests/fast/frames/layout-after-destruction.html b/third_party/WebKit/LayoutTests/fast/frames/layout-after-destruction.html
index ce1c83f..71891fa 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/layout-after-destruction.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/layout-after-destruction.html
@@ -4,15 +4,15 @@ function runTest()
     if (!window.sessionStorage)
         return;
     
-    if (window.layoutTestController) {
-        layoutTestController.waitUntilDone();
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.waitUntilDone();
+        testRunner.dumpAsText();
     }
 
     if (sessionStorage.testCompleted) {
         delete sessionStorage.testCompleted;
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     } else {
         sessionStorage.testCompleted = true;
         document.location.reload(true);
diff --git a/third_party/WebKit/LayoutTests/fast/frames/location-put-after-removal.html b/third_party/WebKit/LayoutTests/fast/frames/location-put-after-removal.html
index 6f20f5d..4a7c7ed 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/location-put-after-removal.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/location-put-after-removal.html
@@ -4,8 +4,8 @@ http://bugs.webkit.org/show_bug.cgi?id=16328</a>.</p>
 <p>If the test passes, you'll see a PASS message below.</p>
 
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 
 <iframe src="resources/location-put-after-removal-frame.html"></iframe>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/location-redirect-user-gesture.html b/third_party/WebKit/LayoutTests/fast/frames/location-redirect-user-gesture.html
index a019f9c..9d9d9d1 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/location-redirect-user-gesture.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/location-redirect-user-gesture.html
@@ -2,13 +2,13 @@
 <head>
 <script>      
     function runTests() {
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.dumpUserGestureInFrameLoadCallbacks();
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.dumpUserGestureInFrameLoadCallbacks();
+            testRunner.waitUntilDone();
         }
 
-        setTimeout("location.href='data:text/html,<script>layoutTestController.notifyDone()</" + "script>'", 1000);
+        setTimeout("location.href='data:text/html,<script>testRunner.notifyDone()</" + "script>'", 1000);
     }
     </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/lots-of-iframes.html b/third_party/WebKit/LayoutTests/fast/frames/lots-of-iframes.html
index c40bd11..d6e8b7a 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/lots-of-iframes.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/lots-of-iframes.html
@@ -5,8 +5,8 @@
 <script type="text/javascript">
   var maxNumberOfFrames = 1000;
 
-  if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+  if (window.testRunner)
+    testRunner.dumpAsText();
 
   function createIFrames() {
     var str = "<div id=\"status\"></div>";
diff --git a/third_party/WebKit/LayoutTests/fast/frames/lots-of-objects.html b/third_party/WebKit/LayoutTests/fast/frames/lots-of-objects.html
index 1e5ecb4..21fe9957 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/lots-of-objects.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/lots-of-objects.html
@@ -5,8 +5,8 @@
 <script type="text/javascript">
   var maxNumberOfFrames = 1000;
 
-  if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+  if (window.testRunner)
+    testRunner.dumpAsText();
 
   var createdObjects = 0;
   function count() {
diff --git a/third_party/WebKit/LayoutTests/fast/frames/meta-refresh-user-gesture.html b/third_party/WebKit/LayoutTests/fast/frames/meta-refresh-user-gesture.html
index 8c98986..f981a12 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/meta-refresh-user-gesture.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/meta-refresh-user-gesture.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="refresh" content="2;./resources/meta-refresh-target.html">
 <script>      
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpUserGestureInFrameLoadCallbacks();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpUserGestureInFrameLoadCallbacks();
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/negative-remaining-length-crash.html b/third_party/WebKit/LayoutTests/fast/frames/negative-remaining-length-crash.html
index 802065b..4e38ad5 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/negative-remaining-length-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/negative-remaining-length-crash.html
@@ -2,8 +2,8 @@
 <head>
     <title></title>
     <script type="text/javascript">
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
     </script>
 </head>
 <frameset cols="6,*">
diff --git a/third_party/WebKit/LayoutTests/fast/frames/onload-remove-iframe-crash.html b/third_party/WebKit/LayoutTests/fast/frames/onload-remove-iframe-crash.html
index d1dab6d..be79919 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/onload-remove-iframe-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/onload-remove-iframe-crash.html
@@ -11,8 +11,8 @@ document.
 <div id="div"></div>
 
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 document.getElementById('div').innerHTML = '<iframe src="about:blank" onload="this.parentNode.removeChild(this)"></iframe>';
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/removal-before-attach-crash.html b/third_party/WebKit/LayoutTests/fast/frames/removal-before-attach-crash.html
index 4ff8ce8..3223d9d 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/removal-before-attach-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/removal-before-attach-crash.html
@@ -5,8 +5,8 @@
 
         function test()
         {
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
 
             var script = document.createElement("script");
             script.appendChild(document.createTextNode("document.body.removeChild(parent);"));
diff --git a/third_party/WebKit/LayoutTests/fast/frames/remove-frame-with-scrollbars-crash.html b/third_party/WebKit/LayoutTests/fast/frames/remove-frame-with-scrollbars-crash.html
index 6e683f9..c85b59e 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/remove-frame-with-scrollbars-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/remove-frame-with-scrollbars-crash.html
@@ -16,10 +16,10 @@ function destroyIframe()
 {
     iframe.parentNode.removeChild(iframe);
     log("PASS: Yout didn't crash.");
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 
 iframe.onload = function() { setTimeout(destroyIframe, 0); }
-layoutTestController.dumpAsText();
-layoutTestController.waitUntilDone();
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/repaint-display-none-crash.html b/third_party/WebKit/LayoutTests/fast/frames/repaint-display-none-crash.html
index 38424e3..077ca30 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/repaint-display-none-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/repaint-display-none-crash.html
@@ -1,7 +1,7 @@
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function test()
@@ -11,8 +11,8 @@
         t.style.display='none';
         t.src='about:blank';
         t.contentDocument.body.offsetTop;
-        if (window.layoutTestController) {
-            layoutTestController.notifyDone();
+        if (window.testRunner) {
+            testRunner.notifyDone();
         }
     }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/fail-and-notify-done.html b/third_party/WebKit/LayoutTests/fast/frames/resources/fail-and-notify-done.html
index f0e5682..97dcf2e 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/fail-and-notify-done.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/fail-and-notify-done.html
@@ -1,5 +1,5 @@
 FAIL
 <script>
-if (window.layoutTestController)
-    layoutTestController.notifyDone();
+if (window.testRunner)
+    testRunner.notifyDone();
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/frame-dead-region-left.html b/third_party/WebKit/LayoutTests/fast/frames/resources/frame-dead-region-left.html
index e53fd6d..a0759c4 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/frame-dead-region-left.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/frame-dead-region-left.html
@@ -14,7 +14,7 @@
 
     function runTest()
     {
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             eventSender.mouseMoveTo(X, Y);
             eventSender.mouseDown();
             eventSender.mouseUp();
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/frame-navigation-child.html b/third_party/WebKit/LayoutTests/fast/frames/resources/frame-navigation-child.html
index cc87a2b..ec581c5 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/frame-navigation-child.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/frame-navigation-child.html
@@ -1,10 +1,10 @@
 <p>This tests that navigating to two pages in a subframe, and then going back does not cause an assertion.</p>
 <p>SUCCESS - Didn't assert!</p>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.queueLoad('data:text/html,test1', 'target')
-    layoutTestController.queueLoad('data:text/html,test2', 'target')
-    layoutTestController.queueBackNavigation(1);
+if (window.testRunner) {
+    testRunner.queueLoad('data:text/html,test1', 'target')
+    testRunner.queueLoad('data:text/html,test2', 'target')
+    testRunner.queueBackNavigation(1);
 } else
     document.write('This test must be run by DumpRenderTree!')
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/iframe-focus.html b/third_party/WebKit/LayoutTests/fast/frames/resources/iframe-focus.html
index e811210..204ad6d 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/iframe-focus.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/iframe-focus.html
@@ -4,7 +4,7 @@
             function test()
             {
                 window.focus();
-                layoutTestController.queueReload();
+                testRunner.queueReload();
             }
         </script>
     </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/location-change-frame-1.html b/third_party/WebKit/LayoutTests/fast/frames/resources/location-change-frame-1.html
index 3c827d3..b547011 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/location-change-frame-1.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/location-change-frame-1.html
@@ -1,8 +1,8 @@
 <p>The frame on the right should <i>not</i> say 'hello world'.</p>
 <script>
-if (window.layoutTestController) {
-  layoutTestController.dumpAsText();
-  layoutTestController.waitUntilDone();
+if (window.testRunner) {
+  testRunner.dumpAsText();
+  testRunner.waitUntilDone();
 }
 parent.frames[1].location='location-change-frame-2.html'
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/location-change-frame-2.html b/third_party/WebKit/LayoutTests/fast/frames/resources/location-change-frame-2.html
index 824f435..19a32ff 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/location-change-frame-2.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/location-change-frame-2.html
@@ -1,7 +1,7 @@
 <p>SUCCESS</p>
 <script>
-if (window.layoutTestController) {
+if (window.testRunner) {
   alert("SUCCESS");
-  layoutTestController.notifyDone();
+  testRunner.notifyDone();
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/meta-refresh-target.html b/third_party/WebKit/LayoutTests/fast/frames/resources/meta-refresh-target.html
index f2099c3..5823753 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/meta-refresh-target.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/meta-refresh-target.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-if (layoutTestController)
-    layoutTestController.notifyDone();
+if (testRunner)
+    testRunner.notifyDone();
 </script>
 </head>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/no-file-access-frame-1.html b/third_party/WebKit/LayoutTests/fast/frames/resources/no-file-access-frame-1.html
index 8a0e071..cf687a5 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/no-file-access-frame-1.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/no-file-access-frame-1.html
@@ -1,11 +1,11 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.setAllowUniversalAccessFromFileURLs(false);
-    layoutTestController.setAllowFileAccessFromFileURLs(false);
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.setAllowUniversalAccessFromFileURLs(false);
+    testRunner.setAllowFileAccessFromFileURLs(false);
 }
 window.onload = function() {
     parent.frames[1].location='no-file-access-frame-2.html';
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/no-file-access-frame-2.html b/third_party/WebKit/LayoutTests/fast/frames/resources/no-file-access-frame-2.html
index cde2184..15a5ed4 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/no-file-access-frame-2.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/no-file-access-frame-2.html
@@ -1,7 +1,7 @@
 <p>SUCCESS</p>
 <script>
-if (window.layoutTestController) {
+if (window.testRunner) {
     alert("SUCCESS");
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/pass-and-notify-done.html b/third_party/WebKit/LayoutTests/fast/frames/resources/pass-and-notify-done.html
index 0145132..a4f3853 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/pass-and-notify-done.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/pass-and-notify-done.html
@@ -1,5 +1,5 @@
 PASS
 <script>
-if (window.layoutTestController)
-    layoutTestController.notifyDone();
+if (window.testRunner)
+    testRunner.notifyDone();
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-disallowed.html b/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-disallowed.html
index 87b3538..7623ea9 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-disallowed.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-disallowed.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function debug(msg)
 {
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/set-src-to-javascript-url.html b/third_party/WebKit/LayoutTests/fast/frames/resources/set-src-to-javascript-url.html
index 9edc158..bbac362 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/set-src-to-javascript-url.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/set-src-to-javascript-url.html
@@ -6,8 +6,8 @@ FAIL
         return "test";
     }
 
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     parent.document.getElementById("parent").setAttribute("src", "javascript: returnStringValue()");
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/set-src-to-javascript-url.xhtml b/third_party/WebKit/LayoutTests/fast/frames/resources/set-src-to-javascript-url.xhtml
index 149fa17..2ccdcee 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/set-src-to-javascript-url.xhtml
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/set-src-to-javascript-url.xhtml
@@ -6,8 +6,8 @@ FAIL
         return "test";
     }
 
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     parent.document.getElementById("parent").setAttribute("src", "javascript: returnStringValue()");
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/set-unloaded-frame-location-2.html b/third_party/WebKit/LayoutTests/fast/frames/resources/set-unloaded-frame-location-2.html
index 8c7e67d..516af84 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/set-unloaded-frame-location-2.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/set-unloaded-frame-location-2.html
@@ -3,8 +3,8 @@
 <h3>PASSED: Content loaded</h3>
 <script>
 alert('PASS');
-if (window.layoutTestController)
-    layoutTestController.notifyDone();
+if (window.testRunner)
+    testRunner.notifyDone();
 </script>
 </body>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/subframe-base-url.html b/third_party/WebKit/LayoutTests/fast/frames/resources/subframe-base-url.html
index 1ce8b01..c99f095 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/subframe-base-url.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/subframe-base-url.html
@@ -7,7 +7,7 @@ document.close();
 if (/\/resources\/foobar.html$/.test(document.getElementsByTagName("a")[0].href))
     parent.document.getElementById("testResult").innerHTML = "SUCCESS"
     
-if (window.layoutTestController)
-    layoutTestController.notifyDone();
+if (window.testRunner)
+    testRunner.notifyDone();
 </script>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-about-blank.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-about-blank.html
index d57c5d4..7e0c318 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-about-blank.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-about-blank.html
@@ -3,8 +3,8 @@
 <script src="../js/resources/js-test-pre.js"></script>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 window.onload = function() { 
     if (self.containing_frame.document.getElementById('plugin').destroyStream)
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing.html
index 10ffbb8..5d11ce3 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing.html
@@ -2,8 +2,8 @@
 <head>
 <script>
 
-if (window.layoutTestController)
-    window.layoutTestController.dumpAsText();
+if (window.testRunner)
+    window.testRunner.dumpAsText();
 
 var failed = false;
 var frames = 0;         /* number of allowed frames that called back */
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-close-top-noclose.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-close-top-noclose.html
index ac37186..fb3595e 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-close-top-noclose.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-close-top-noclose.html
@@ -1,11 +1,11 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.setCanOpenWindows();
-    layoutTestController.setCloseRemainingWindowsWhenComplete(true);
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.setCanOpenWindows();
+    testRunner.setCloseRemainingWindowsWhenComplete(true);
 }
 </script>
 </head>
@@ -19,8 +19,8 @@ function start() {
 }
 
 function done() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 // In LayoutTests mode we can start automagically.
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-close-top.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-close-top.html
index 68947c5..72fed90 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-close-top.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-close-top.html
@@ -1,11 +1,11 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.setCanOpenWindows();
-    layoutTestController.setCloseRemainingWindowsWhenComplete(true);
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.setCanOpenWindows();
+    testRunner.setCloseRemainingWindowsWhenComplete(true);
 }
 </script>
 </head>
@@ -23,8 +23,8 @@ function done() {
     // We end the test asynchronously becaues this function is being called
     // from a strange callstack.
     window.setTimeout(function () {
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }, 0);
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-forms-dynamic.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-forms-dynamic.html
index 77b5cb8..6bdc581 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-forms-dynamic.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-forms-dynamic.html
@@ -2,9 +2,9 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    window.layoutTestController.dumpAsText();
-    window.layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    window.testRunner.dumpAsText();
+    window.testRunner.waitUntilDone();
 }
 
 var submissionCount = 0;
@@ -17,8 +17,8 @@ function allowedFormSubmitted()
     if (submissionCount == 2) {
         document.getElementById("test_status").innerHTML = (disallowedSubmission ? "FAIL" : "PASS");
 
-        if (window.layoutTestController)
-            window.layoutTestController.notifyDone();
+        if (window.testRunner)
+            window.testRunner.notifyDone();
     }
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-forms.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-forms.html
index 1d83b34..c91c943 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-forms.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-forms.html
@@ -2,9 +2,9 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    window.layoutTestController.dumpAsText();
-    window.layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    window.testRunner.dumpAsText();
+    window.testRunner.waitUntilDone();
 }
 
 var submissionCount      = 0;
@@ -17,8 +17,8 @@ function allowedFormSubmitted()
     if (submissionCount == 10) {
         document.getElementById("test_status").innerHTML = (disallowedSubmission ? "FAIL" : "PASS");
       
-        if (window.layoutTestController)
-            window.layoutTestController.notifyDone();
+        if (window.testRunner)
+            window.testRunner.notifyDone();
     }
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-history-denied.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-history-denied.html
index 8617aff..007fff3 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-history-denied.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-history-denied.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 window.unload = function() {
@@ -17,8 +17,8 @@ window.onload = function() {
     // wait for a bit.
     setTimeout(function() {
         alert("PASS");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }, 20);
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed.html
index 406e839..d9338d9 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed.html
@@ -3,9 +3,9 @@
 <script src="../js/resources/js-test-pre.js"></script>
 <script>
 
-if (window.layoutTestController) {
-    window.layoutTestController.dumpAsText();
-    window.layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    window.testRunner.dumpAsText();
+    window.testRunner.waitUntilDone();
 }
 
 function childFrameWasNavigated()
@@ -27,8 +27,8 @@ function sandboxWasNavigated()
     shouldBe("document.getElementById('sandboxedFrameId').sandbox", "'allow-scripts allow-same-origin'");
     isSuccessfullyParsed();
 
-    if (window.layoutTestController)
-        window.layoutTestController.notifyDone();
+    if (window.testRunner)
+        window.testRunner.notifyDone();
 }
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-parent.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-parent.html
index 60f8917..3b7e1a6 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-parent.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-parent.html
@@ -2,9 +2,9 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    window.layoutTestController.dumpAsText();
-    window.layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    window.testRunner.dumpAsText();
+    window.testRunner.waitUntilDone();
 }
 
 var navigatedFrames = 0;
@@ -20,8 +20,8 @@ function checkResults()
     else
         testStatus.innerHTML = 'FAIL: frames not navigated properly';
 
-    if (window.layoutTestController)
-        window.layoutTestController.notifyDone();
+    if (window.testRunner)
+        window.testRunner.notifyDone();
 }
 
 function countFrame()
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-targetlink.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-targetlink.html
index 0012edb..4ab57b4 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-targetlink.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-targetlink.html
@@ -2,9 +2,9 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    window.layoutTestController.dumpAsText();
-    window.layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    window.testRunner.dumpAsText();
+    window.testRunner.waitUntilDone();
 }
 
 var navigatedFrames = 0;
@@ -20,8 +20,8 @@ function checkResults()
     else
         testStatus.innerHTML = 'FAIL: frames not navigated properly';
 
-    if (window.layoutTestController)
-        window.layoutTestController.notifyDone();
+    if (window.testRunner)
+        window.testRunner.notifyDone();
 }
 
 function countFrame()
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-constant-name.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-constant-name.html
index 1855ee4..cf31b7f 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-constant-name.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-constant-name.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-constant-name2.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-constant-name2.html
index 1e5dd62..68d901f 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-constant-name2.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-constant-name2.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-name-denied.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-name-denied.html
index d38793a..83a710a 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-name-denied.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-name-denied.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 window.name = "target"
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-name.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-name.html
index 09d39ed..8961c7d 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-name.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-by-name.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 window.name = "target";
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-denied.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-denied.html
index 0f636ad..601b8d6 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-denied.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-denied.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top.html
index 5e10161..c1fb1ab 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-top.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-windowopen.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-windowopen.html
index 024f2fa..ccf35a5 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-windowopen.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-windowopen.html
@@ -2,10 +2,10 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.setCanOpenWindows(true);
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.setCanOpenWindows(true);
 }
 
 var testStatus       = "FAIL: not completed";
@@ -20,8 +20,8 @@ function updateStatus(loaded, done)
 
     if (mainWindowLoaded && testCompleted) {
         document.getElementById("testStatus").innerHTML = testStatus;
-        if (testCompleted && window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (testCompleted && window.testRunner)
+            testRunner.notifyDone();
     }
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-noscript.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-noscript.html
index eef8fed..8955239 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-noscript.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-noscript.html
@@ -2,9 +2,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
 }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-parsing-space-characters.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-parsing-space-characters.html
index c5372e8..a653934 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-parsing-space-characters.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-parsing-space-characters.html
@@ -17,8 +17,8 @@ function next() {
         return;
     }
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function testCharacter(possibleDelimiter, message) {
@@ -30,9 +30,9 @@ function testCharacter(possibleDelimiter, message) {
     document.body.appendChild(iframe);
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 next();
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins.html
index 397547a..1bb2242 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins.html
@@ -2,8 +2,8 @@
 <head>
 <script src="../js/resources/js-test-pre.js"></script>
 <script> 
-if (window.layoutTestController) 
-    layoutTestController.dumpAsText(); 
+if (window.testRunner) 
+    testRunner.dumpAsText(); 
  
 window.onload = function() { 
     shouldBeTrue("(self.appletFrame1.document['app'].init) != undefined");
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-scripting.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-scripting.html
index cdb6570..67f6ae8 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-scripting.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-scripting.html
@@ -2,8 +2,8 @@
 <head>
 <script src="../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    window.layoutTestController.dumpAsText();
+if (window.testRunner)
+    window.testRunner.dumpAsText();
 
 var disallowedExecuted = 0;
 var allowedExecuted = 0;
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-storage.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-storage.html
index d188e45..c600641 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-storage.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-storage.html
@@ -3,9 +3,9 @@
 <script src="../js/resources/js-test-pre.js"></script>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
 }
 
 window.onload = function() { 
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get-named.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get-named.html
index ccf22e2..ab3728e 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get-named.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get-named.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get-override.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get-override.html
index 5339669..d848ab5 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get-override.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get-override.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get.html
index 96f1907..6733484 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-get.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post-named.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post-named.html
index 0b3a546..e62e5db 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post-named.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post-named.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post-override.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post-override.html
index 8cc1290..190effc 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post-override.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post-override.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post.html
index 88dcebe..f076d43 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-form-post.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink-named.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink-named.html
index 54ff4d5..8026a1f 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink-named.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink-named.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink-override.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink-override.html
index f2fd187..5b10c9d 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink-override.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink-override.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink.html
index 3dd8fee..f8ec76d 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-hyperlink.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-href.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-href.html
index 9757bea..f6ea395 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-href.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-href.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-replace.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-replace.html
index b888415..40b2cec 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-replace.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-replace.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-sandbox.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-sandbox.html
index 5eb77fa..d89695d 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-sandbox.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location-sandbox.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner)
+    testRunner.dumpChildFramesAsText();
 </script>
 This test should not cause any navigation.
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location.html
index 6d8a72b..20cb879 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-location.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-open-override.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-open-override.html
index 8c74c58..5433168 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-open-override.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-open-override.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-open.html b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-open.html
index 5c4f813..5e1ec6b 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-open.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/seamless/seamless-window-open.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 window.addEventListener('message', function(evt) {
     shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <iframe srcdoc="
diff --git a/third_party/WebKit/LayoutTests/fast/frames/set-unloaded-frame-location.html b/third_party/WebKit/LayoutTests/fast/frames/set-unloaded-frame-location.html
index 3b0ad6a..8081bb8 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/set-unloaded-frame-location.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/set-unloaded-frame-location.html
@@ -1,8 +1,8 @@
 <html>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 </script>
 <frameset cols="50%, *">
diff --git a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/reloading-a-srcdoc-document-loads-it-again.html b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/reloading-a-srcdoc-document-loads-it-again.html
index 7770280..d5bb3a8 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/reloading-a-srcdoc-document-loads-it-again.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/reloading-a-srcdoc-document-loads-it-again.html
@@ -1,7 +1,7 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 window.iframeLoadCount = 0;
@@ -16,8 +16,8 @@ window.onload = function() {
   alert('Frame has loaded ' + top.iframeLoadCount + ' time(s).');
   if (top.iframeLoadCount == 2) {
     alert('PASS');
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
   } else if (top.iframeLoadCount > 2)
     alert('FAIL!!');
   </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/setting-src-does-nothing.html b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/setting-src-does-nothing.html
index 2754155..ef491d9 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/setting-src-does-nothing.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/setting-src-does-nothing.html
@@ -1,7 +1,7 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
 }
 </script>
 <p>This test ensures that setting the src attribute does not cause the document
diff --git a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/setting-srcdoc-reloads-document.html b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/setting-srcdoc-reloads-document.html
index 8bae471..2ba4faa 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/setting-srcdoc-reloads-document.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/setting-srcdoc-reloads-document.html
@@ -1,13 +1,13 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function pass() {
     document.getElementById('result').textContent = 'PASS';
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 <p>This test ensures that setting the srcdoc attribute iframe causes the
diff --git a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-beats-src-dom.html b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-beats-src-dom.html
index 7ce14ac..0948fad 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-beats-src-dom.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-beats-src-dom.html
@@ -1,7 +1,7 @@
 <body>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var ifrm = document.createElement("iframe");
 ifrm.srcdoc = "PASS";
diff --git a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-beats-src.html b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-beats-src.html
index dc81b85..fcaf011 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-beats-src.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-beats-src.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 <iframe src="data:text/html,<script>alert(/FAIL/);</script>" srcdoc="PASS"></iframe>
 This test passes if it doesn't alert FAIL.
diff --git a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-can-be-in-qurks-mode.html b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-can-be-in-qurks-mode.html
index 5521b29..a56b653 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-can-be-in-qurks-mode.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-can-be-in-qurks-mode.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 Normally srcdoc documents default to standards mode, but they can end up in
 quirks mode with a sufficiently nutty DocType.
diff --git a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-can-navigate.html b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-can-navigate.html
index 32e4455..e321322 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-can-navigate.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-can-navigate.html
@@ -1,10 +1,10 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
+    testRunner.waitUntilDone();
 }
 </script>
 <iframe srcdoc="FAIL
 <script>
-window.location = 'data:text/html,PASS<script>if (window.layoutTestController) layoutTestController.notifyDone();<\/script>';</script>"></iframe>
+window.location = 'data:text/html,PASS<script>if (window.testRunner) testRunner.notifyDone();<\/script>';</script>"></iframe>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-defaults-to-standards-mode.html b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-defaults-to-standards-mode.html
index 2d1cc0d..f81c290 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-defaults-to-standards-mode.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-defaults-to-standards-mode.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 Even through the srcdoc below doesn't have a DocType, it should still be in
 standards mode.
diff --git a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-loads-content.html b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-loads-content.html
index ea4c418..5599c62 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-loads-content.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-loads-content.html
@@ -1,7 +1,7 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
 }
 </script>
 <iframe srcdoc="PASS"></iframe>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-urls.html b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-urls.html
index dda836e..5d69955 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-urls.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/srcdoc/srcdoc-urls.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 A srcdoc document should inherit its document.baseURI from its parent (but not
 its document.URI).
diff --git a/third_party/WebKit/LayoutTests/fast/frames/subframe-load-crash-main.html b/third_party/WebKit/LayoutTests/fast/frames/subframe-load-crash-main.html
index 340dd99e..065101e 100755
--- a/third_party/WebKit/LayoutTests/fast/frames/subframe-load-crash-main.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/subframe-load-crash-main.html
@@ -1,17 +1,17 @@
 <html>
 <object data="resources/subframe-load-crash.svg" id="root" onload="runTest()"></object>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 function runTest() {
     root = document.getElementById('root').contentDocument;
     root.addEventListener('load', function() { document.open(); document.write("PASS"); document.close(); }, 1);
     setTimeout(function() {
         root.getElementById('test').appendChild(document.createElement('iframe'));
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();      
+        if (window.testRunner)
+            testRunner.notifyDone();      
     }, 0);
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/subframe-load-js-url-crash.html b/third_party/WebKit/LayoutTests/fast/frames/subframe-load-js-url-crash.html
index 16b242f..bf5a410 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/subframe-load-js-url-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/subframe-load-js-url-crash.html
@@ -1,3 +1,3 @@
 <div>Test passes if it does not crash.</div>
-<script>if (window.layoutTestController) layoutTestController.dumpAsText();</script>
+<script>if (window.testRunner) testRunner.dumpAsText();</script>
 <iframe src="resources/subframe-load-js-url-crash-iframe.html"></iframe>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/take-focus-from-iframe.html b/third_party/WebKit/LayoutTests/fast/frames/take-focus-from-iframe.html
index bceeff2..63eade2 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/take-focus-from-iframe.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/take-focus-from-iframe.html
@@ -2,8 +2,8 @@
 <iframe src="data:text/html,<body><input><script>document.getElementsByTagName('input')[0].focus()</script></body>" height=40 width=200></iframe>
 <p>This field should look and act focused. Try to type into it: <input></p>
 <script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 function test()
 {
@@ -25,8 +25,8 @@ function test2()
             input.value = "PASS";
     }
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/transparent-scrollbar.html b/third_party/WebKit/LayoutTests/fast/frames/transparent-scrollbar.html
index b604ab5..eb3c56b 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/transparent-scrollbar.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/transparent-scrollbar.html
@@ -20,17 +20,17 @@ body {
 <script>
 function test()
 {
-    if (window.layoutTestController) {
-        layoutTestController.waitUntilDone();
-        layoutTestController.dumpAsText(true);
-        layoutTestController.display();
+    if (window.testRunner) {
+        testRunner.waitUntilDone();
+        testRunner.dumpAsText(true);
+        testRunner.display();
     }
 
     window.setTimeout(function() {
         document.body.scrollTop = 2000;
-        if (window.layoutTestController) {
-            layoutTestController.display();
-            layoutTestController.notifyDone();
+        if (window.testRunner) {
+            testRunner.display();
+            testRunner.notifyDone();
         }
     }, 0);
 }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/url-selected-crash.html b/third_party/WebKit/LayoutTests/fast/frames/url-selected-crash.html
index 673bc1a..52b606b 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/url-selected-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/url-selected-crash.html
@@ -3,9 +3,9 @@
 <body>
 Test passes if it doesn't crash (may require libgmalloc and repeating) and this line gets erased.
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 var iterationsLeft = 2;
 function test()
@@ -14,8 +14,8 @@ function test()
         frames[0].history.go(0);
     } else {
         document.body.textContent = frames[0].document.body.textContent;
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/viewsource-empty-attribute-value.html b/third_party/WebKit/LayoutTests/fast/frames/viewsource-empty-attribute-value.html
index e80e43f..41cd33d 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/viewsource-empty-attribute-value.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/viewsource-empty-attribute-value.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.dumpChildFramesAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.dumpChildFramesAsText();
     }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/viewsource-linebreak.html b/third_party/WebKit/LayoutTests/fast/frames/viewsource-linebreak.html
index 788b5df..357184f 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/viewsource-linebreak.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/viewsource-linebreak.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.dumpChildFramesAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.dumpChildFramesAsText();
     }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/viewsource-link-on-href-value.html b/third_party/WebKit/LayoutTests/fast/frames/viewsource-link-on-href-value.html
index 3676cdf..6c2cc829 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/viewsource-link-on-href-value.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/viewsource-link-on-href-value.html
@@ -2,9 +2,9 @@
 <!-- This tests that a base element is respected in rendering anchors on viewsource page. -->
 <head>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function checkFrame(id) {
@@ -42,12 +42,12 @@
         if (checkFrame("lower") && checkFrame("upper")) {
             resultText = "PASS";
         }
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             document.open();
             document.write(resultText);
             document.close();
 
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         } else {
             document.getElementById("result").textContent = resultText;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/viewsource-plain-text-tags.html b/third_party/WebKit/LayoutTests/fast/frames/viewsource-plain-text-tags.html
index b3c0233..2346afc 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/viewsource-plain-text-tags.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/viewsource-plain-text-tags.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function found(text, regexString)
@@ -32,11 +32,11 @@
         resultText += testSection(result, 'xmp');
         resultText += testSection(result, 'textarea');
 
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             document.open();
             document.write(resultText);
             document.close();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         } else {
             document.getElementById("result").textContent = resultText;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/frames/viewsource-unfinished-tags.html b/third_party/WebKit/LayoutTests/fast/frames/viewsource-unfinished-tags.html
index c91ef33..65648c6 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/viewsource-unfinished-tags.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/viewsource-unfinished-tags.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     var results = {};
@@ -18,13 +18,13 @@
             var resultText = "FAIL";
 
         results[tag] = resultText;
-        if (window.layoutTestController && results["script"] && results["textarea"]) {
+        if (window.testRunner && results["script"] && results["textarea"]) {
             document.open();
             document.write("script: " + results["script"] + "<br>");
             document.write("textarea: " + results["textarea"] + "<br>");
             document.close();
 
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         } else {
             document.getElementById(tag + "_result").textContent = resultText;
         }
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/crash-on-1px-border.html b/third_party/WebKit/LayoutTests/fast/gradients/crash-on-1px-border.html
index a63c049..ff71d2d 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/crash-on-1px-border.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/crash-on-1px-border.html
@@ -6,8 +6,8 @@
 }
 </style>
 <script>
-if (window.layoutTestController)
-  window.layoutTestController.dumpAsText();
+if (window.testRunner)
+  window.testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/crash-on-degenerate-gradient.html b/third_party/WebKit/LayoutTests/fast/gradients/crash-on-degenerate-gradient.html
index 82b2194..a1ab462 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/crash-on-degenerate-gradient.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/crash-on-degenerate-gradient.html
@@ -1,7 +1,7 @@
 <head>
 <script>
-if (window.layoutTestController)
-  window.layoutTestController.dumpAsText();
+if (window.testRunner)
+  window.testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/crash-on-remove.html b/third_party/WebKit/LayoutTests/fast/gradients/crash-on-remove.html
index 839c24c6..ab108a6 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/crash-on-remove.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/crash-on-remove.html
@@ -8,8 +8,8 @@
 <div id="target" style="width: 100px; height: 100px; background-color: green; background-image: -webkit-gradient(linear, left top, left bottom, from(red), to(transparent))">
 </div>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     document.body.offsetTop;
     document.getElementById("target").style.removeProperty("background-image");
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/crash-on-tr.html b/third_party/WebKit/LayoutTests/fast/gradients/crash-on-tr.html
index 24b8cb0..6b410bd 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/crash-on-tr.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/crash-on-tr.html
@@ -5,8 +5,8 @@
 }
 </style>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 </head>
 
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-color-stop-units.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-color-stop-units.html
index 2787876..8217328 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-color-stop-units.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-color-stop-units.html
@@ -68,9 +68,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
+    if (window.testRunner) {
       var dumpPixels = true;
-      layoutTestController.dumpAsText(dumpPixels);
+      testRunner.dumpAsText(dumpPixels);
     }
   </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-color-stops.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-color-stops.html
index 4509f4e..b8a41ab 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-color-stops.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-color-stops.html
@@ -60,9 +60,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
+    if (window.testRunner) {
       var dumpPixels = true;
-      layoutTestController.dumpAsText(dumpPixels);
+      testRunner.dumpAsText(dumpPixels);
     }
   </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-linear-angle-gradients.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-linear-angle-gradients.html
index f076096..df389f7 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-linear-angle-gradients.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-linear-angle-gradients.html
@@ -58,9 +58,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
+    if (window.testRunner) {
       var dumpPixels = true;
-      layoutTestController.dumpAsText(dumpPixels);
+      testRunner.dumpAsText(dumpPixels);
     }
   </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-linear-right-angle-gradients.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-linear-right-angle-gradients.html
index a22bd34..3cefc2e 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-linear-right-angle-gradients.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-linear-right-angle-gradients.html
@@ -44,9 +44,9 @@
     }
 </style> 
 <script>
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         var dumpPixels = true;
-        layoutTestController.dumpAsText(dumpPixels);
+        testRunner.dumpAsText(dumpPixels);
     }
 </script>
 </head> 
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradient-crash.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradient-crash.html
index be9ad58..7d0f6c7 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradient-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradient-crash.html
@@ -1,7 +1,7 @@
 <head>
 <script>
-if (window.layoutTestController)
-  window.layoutTestController.dumpAsText();
+if (window.testRunner)
+  window.testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients.html
index b352419..82539836 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients.html
@@ -59,9 +59,9 @@
 
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
+    if (window.testRunner) {
       var dumpPixels = true;
-      layoutTestController.dumpAsText(dumpPixels);
+      testRunner.dumpAsText(dumpPixels);
     }
   </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients2.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients2.html
index 88cf161..04015b3 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients2.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients2.html
@@ -46,9 +46,9 @@
 
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
+    if (window.testRunner) {
       var dumpPixels = true;
-      layoutTestController.dumpAsText(dumpPixels);
+      testRunner.dumpAsText(dumpPixels);
     }
   </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients3.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients3.html
index e85879d..5bc5c5b 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients3.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-radial-gradients3.html
@@ -24,9 +24,9 @@
 
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
+    if (window.testRunner) {
       var dumpPixels = true;
-      layoutTestController.dumpAsText(dumpPixels);
+      testRunner.dumpAsText(dumpPixels);
     }
   </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-end-fill.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-end-fill.html
index fb5871b..d25299d 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-end-fill.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-end-fill.html
@@ -14,9 +14,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
+    if (window.testRunner) {
       var dumpPixels = true;
-      layoutTestController.dumpAsText(dumpPixels);
+      testRunner.dumpAsText(dumpPixels);
     }
   </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-linear-gradients.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-linear-gradients.html
index d63ec02..6275559 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-linear-gradients.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-linear-gradients.html
@@ -59,9 +59,9 @@
 
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
+    if (window.testRunner) {
       var dumpPixels = true;
-      layoutTestController.dumpAsText(dumpPixels);
+      testRunner.dumpAsText(dumpPixels);
     }
   </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-linear-gradients2.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-linear-gradients2.html
index b340c4c..61f483e1 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-linear-gradients2.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-linear-gradients2.html
@@ -18,9 +18,9 @@
     }
   </style>
   <script>
-    if (window.layoutTestController) {
+    if (window.testRunner) {
       var dumpPixels = true;
-      layoutTestController.dumpAsText(dumpPixels);
+      testRunner.dumpAsText(dumpPixels);
     }
   </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-radial-gradients.html b/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-radial-gradients.html
index 53c498f..f775076 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-radial-gradients.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/css3-repeating-radial-gradients.html
@@ -59,9 +59,9 @@
 
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
+    if (window.testRunner) {
       var dumpPixels = true;
-      layoutTestController.dumpAsText(dumpPixels);
+      testRunner.dumpAsText(dumpPixels);
     }
   </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/gradient-after-transparent-border.html b/third_party/WebKit/LayoutTests/fast/gradients/gradient-after-transparent-border.html
index 8d13117..640b281 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/gradient-after-transparent-border.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/gradient-after-transparent-border.html
@@ -19,8 +19,8 @@
 }
 </style>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText(true);
+if (window.testRunner)
+    testRunner.dumpAsText(true);
 </script>
 </head><body>
 <p>Test for Bug 51240: PASS if the second box is painted as an opaque blue-to-green square.</p>
diff --git a/third_party/WebKit/LayoutTests/fast/gradients/gradient-on-pseudoelement-crash.html b/third_party/WebKit/LayoutTests/fast/gradients/gradient-on-pseudoelement-crash.html
index fabf1fa..5bdd5af 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/gradient-on-pseudoelement-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/gradients/gradient-on-pseudoelement-crash.html
@@ -7,8 +7,8 @@ body:first-line {
 }
 </style>
 <script type="text/javascript" charset="utf-8">
-  if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+  if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/platform/chromium/fast/forms/search-popup-crasher.html b/third_party/WebKit/LayoutTests/platform/chromium/fast/forms/search-popup-crasher.html
index bdacda0..2b54f22 100644
--- a/third_party/WebKit/LayoutTests/platform/chromium/fast/forms/search-popup-crasher.html
+++ b/third_party/WebKit/LayoutTests/platform/chromium/fast/forms/search-popup-crasher.html
@@ -3,8 +3,8 @@
 <script>
 window.onload = function()
 {
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     if (window.location.href.indexOf('formSubmitted') != -1)
         return;
diff --git a/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/menulist-typeahead-find.html b/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/menulist-typeahead-find.html
index 0623723..52677fb 100644
--- a/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/menulist-typeahead-find.html
+++ b/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/menulist-typeahead-find.html
@@ -32,8 +32,8 @@ function testTypeAheadFind(keys, expectedMenuListText)
     result.innerHTML += "was " + menulist.value;
 }
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 testTypeAheadFind(['a'], "Apple");
 testTypeAheadFind(['c'], "Carrot");
diff --git a/third_party/WebKit/LayoutTests/platform/gtk/fast/frames/scrolling-iframe-out-of-viewport.html b/third_party/WebKit/LayoutTests/platform/gtk/fast/frames/scrolling-iframe-out-of-viewport.html
index 1476d07..c555050 100644
--- a/third_party/WebKit/LayoutTests/platform/gtk/fast/frames/scrolling-iframe-out-of-viewport.html
+++ b/third_party/WebKit/LayoutTests/platform/gtk/fast/frames/scrolling-iframe-out-of-viewport.html
@@ -9,14 +9,14 @@ function scrollFrame()
     var id = setInterval(function() {
         if (location > 260) {
             clearInterval(id);
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
 
         document.getElementById("frame").contentWindow.scrollTo(0, location);
         location += 5;
     }, 100);
 }
-layoutTestController.waitUntilDone();
+testRunner.waitUntilDone();
 </script>
 <body onload="scrollFrame();">
 <iframe id="frame" style="position:absolute; top:400px; left: 0px; width:500; height:200;" src="resources/scrolling-iframe-out-of-viewport-interior.html"/>
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/attributed-strings.html b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/attributed-strings.html
index 4bdcc7c..7e6cfd5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/attributed-strings.html
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/attributed-strings.html
@@ -18,11 +18,11 @@ body { margin: 0; padding: 0 }
         console_messages.appendChild(item);
     }
     
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         
         try {
 
-            layoutTestController.dumpAsText();
+            testRunner.dumpAsText();
                         document.getElementById("test").focus();
 
             var substr = textInputController.attributedSubstringFromRange(0, 2);
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/listbox-scrollbar-hit-test.html b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/listbox-scrollbar-hit-test.html
index 8eb04cd..ea5bc13 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/listbox-scrollbar-hit-test.html
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/listbox-scrollbar-hit-test.html
@@ -60,9 +60,9 @@
     
     function test()
     {
-      if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+      if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
       }
       
       if (!window.eventSender) {
@@ -74,8 +74,8 @@
       setTimeout(function() {
         mouseDownOnSelect('select1', 0, 0);
         mouseDownOnSelect('select2', 50, 50);
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
   </script>
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/script-tests/focus-option-control-on-page.js b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/script-tests/focus-option-control-on-page.js
index f3292f9..d12fc3e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/script-tests/focus-option-control-on-page.js
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/script-tests/focus-option-control-on-page.js
@@ -6,7 +6,7 @@ var result;
 function startTest() {
     debug("Pressing tab 4 times:");
     modifiers = undefined;
-    layoutTestController.focusWebView(runKeyPresses);
+    testRunner.focusWebView(runKeyPresses);
 }
 
 function runKeyPresses() {
@@ -21,29 +21,29 @@ function runKeyPresses() {
             shouldBe('result', '" /1:focused text field /2: /3:focused text field /4:"');
             debug("Pressing shift-tab 4 times:");
             modifiers = ["shiftKey"];
-            layoutTestController.focusWebView(runKeyPresses);
+            testRunner.focusWebView(runKeyPresses);
             break;
         case 2:
             shouldBe('result', '" /1:focused text field /2: /3:focused text field /4:"');
             debug("Pressing option-tab 4 times:");
             modifiers = ["altKey"];
-            layoutTestController.focusWebView(runKeyPresses);
+            testRunner.focusWebView(runKeyPresses);
             break;
         case 3:
             shouldBe('result', '" /1:focused first button /2:focused text field /3:focused second button /4:"');
             debug("Pressing shift-option-tab 4 times:");
             modifiers = ["shiftKey", "altKey"];
-            layoutTestController.focusWebView(runKeyPresses);
+            testRunner.focusWebView(runKeyPresses);
             break;
         case 4:
             shouldBe('result', '" /1:focused second button /2:focused text field /3:focused first button /4:"');
-            layoutTestController.removeChromeInputField(notifyDone);
+            testRunner.removeChromeInputField(notifyDone);
             break;
     }
 }
 
 function notifyDone() {
-    setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+    setTimeout(function() { testRunner.notifyDone(); }, 0);
 }
 
 function log(val) {
@@ -51,9 +51,9 @@ function log(val) {
 }
 
 /////////////////////////////////
-if (window.layoutTestController && window.eventSender && layoutTestController.addChromeInputField) {
+if (window.testRunner && window.eventSender && testRunner.addChromeInputField) {
     window.jsTestIsAsync = true;
-    layoutTestController.addChromeInputField(startTest);
+    testRunner.addChromeInputField(startTest);
 } else
     finishJSTest();