Attachment 152415 Details for Bug 91315 – Patch

[patch] Patch

bug-91315-20120714012311.patch (text/plain), 280.46 KB, created by Ryosuke Niwa on 2012-07-14 01:23:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2012-07-14 01:23:12 PDT

Size: 280.46 KB

patch

obsolete

>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 122662)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,103 @@
>+2012-07-14  Ryosuke Niwa  <rniwa@webkit.org>
>+
>+        Use testRunner instead of layoutTestController in fast/js, layers, leaks, line-grid, lists, loader, loading, media, mediastream, multicol, and mutation tests
>+        https://bugs.webkit.org/show_bug.cgi?id=91315
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/js/:
>+        * fast/layers/add-layer-with-nested-stacking.html:
>+        * fast/layers/assert-RenderLayer-update-positions.html:
>+        * fast/layers/clip-rects-assertion.html:
>+        * fast/layers/clip-rects-transformed-2.html:
>+        * fast/layers/clip-rects-transformed.html:
>+        * fast/layers/generated-layer-scrollbar-crash.html:
>+        * fast/layers/inline-dirty-z-order-lists.html:
>+        * fast/layers/layer-content-visibility-change.html:
>+        * fast/layers/layer-visibility.html:
>+        * fast/layers/nested-layers-1.html:
>+        * fast/layers/nested-layers-2.html:
>+        * fast/layers/nested-layers-3.html:
>+        * fast/layers/nested-layers-4.html:
>+        * fast/layers/remove-layer-with-nested-stacking.html:
>+        * fast/layers/remove-only-this-layer-update.html:
>+        * fast/layers/removed-by-scroll-handler.html:
>+        * fast/layers/resize-layer-deletion-crash.html:
>+        * fast/layers/scroll-with-transform-composited-layer.html:
>+        * fast/layers/scroll-with-transform-layer.html:
>+        * fast/layers/scrollByLines-overflow-no-layer.html:
>+        * fast/layers/visible-layer-with-hidden-parent.html:
>+        * fast/layers/zindex-hit-test.html:
>+        * fast/leaks/001.html:
>+        * fast/leaks/002.html:
>+        * fast/leaks/003.html-disabled:
>+        * fast/line-grid/line-grid-nested.html:
>+        * fast/lists/alpha-boundary-values.html:
>+        * fast/lists/alpha-list-wrap.html:
>+        * fast/lists/calc-width-with-space.html:
>+        * fast/lists/decimal-leading-zero.html:
>+        * fast/lists/drag-into-marker.html:
>+        * fast/lists/item-not-in-list-line-wrapping.html:
>+        * fast/lists/li-values.html:
>+        * fast/lists/list-style-type-dynamic-change.html:
>+        * fast/lists/ol-nested-items-dynamic-insert.html:
>+        * fast/lists/ol-nested-items-dynamic-remove.html:
>+        * fast/lists/ol-nested-items.html:
>+        * fast/lists/ol-nested-list-dynamic-insert.html:
>+        * fast/lists/ol-nested-list-dynamic-remove.html:
>+        * fast/lists/ol-nested-list.html:
>+        * fast/lists/ol-reversed-dynamic-simple.html:
>+        * fast/lists/ol-reversed-dynamic.html:
>+        * fast/lists/ol-reversed-nested-items.html:
>+        * fast/lists/ol-reversed-nested-list.html:
>+        * fast/lists/ol-reversed-simple.html:
>+        * fast/lists/ol-reversed-simple.xhtml:
>+        * fast/lists/ol-start-roman.html:
>+        * fast/lists/parent-box-not-box-crash.html:
>+        * fast/lists/positioned-count-crash.html:
>+        * fast/lists/remove-listmarker-from-anonblock-with-continuation-crash.html:
>+        * fast/lists/resources/dump-list.js:
>+        (dumpListItemAsHTML):
>+        (testListItemMarkerEqualsListItemText):
>+        * fast/lists/w3-css3-list-styles-alphabetic.html:
>+        * fast/lists/w3-css3-list-styles-fallback-style.html:
>+        * fast/lists/w3-css3-list-styles-numeric.html:
>+        * fast/lists/w3-css3-list-styles-symbolic.html:
>+        * fast/lists/w3-css3-lower-armenian.html:
>+        * fast/lists/w3-css3-upper-armenian.html:
>+        * fast/lists/w3-list-styles.html:
>+        * fast/loader/:
>+        * fast/media/color-does-not-include-alpha.html:
>+        * fast/media/invalid-lengths.html:
>+        * fast/media/lifetime.html:
>+        * fast/media/matchmedium-query-api.html:
>+        * fast/media/media-query-list-01.html:
>+        * fast/media/media-query-list-02.html:
>+        * fast/media/media-query-list-03.html:
>+        * fast/media/media-query-list-04.html:
>+        * fast/media/media-query-list-05.html:
>+        * fast/media/media-query-list-06.html:
>+        * fast/media/media-query-list-07.html:
>+        * fast/media/media-query-list-callback.html:
>+        * fast/media/media-svg-crash.html:
>+        * fast/media/mq-pointer.html:
>+        * fast/media/print-restores-previous-mediatype.html:
>+        * fast/media/update-media-query-css-parser.html:
>+        * fast/media/view-mode-media-feature.html:
>+        * fast/multicol/:
>+        * fast/mutation/end-of-task-delivery.html:
>+        * fast/mutation/inline-event-listener.html:
>+        * fast/mutation/mutation-callback-non-element-crash.html:
>+        * platform/chromium/fast/loader/create-view-target-blank.html:
>+        * platform/chromium/fast/loader/resources/done.html:
>+        * platform/gtk/fast/loader/crash-display-local-directory.html:
>+        * platform/mac/fast/loader/file-url-mimetypes-2.html:
>+        * platform/mac/fast/loader/file-url-mimetypes-3.html:
>+        * platform/mac/fast/loader/file-url-mimetypes.html:
>+        * platform/mac/fast/loader/non-html-load-event.html:
>+        * platform/mac/fast/loader/webarchive-encoding-respected.html:
>+        * platform/qt/fast/loader/user-stylesheet-qrc-path.html:
>+
> 2012-07-14  Zan Dobersek  <zandobersek@gmail.com>
> 
>         Unreviewed GTK gardening, marking http/tests/misc/webtiming-origins.html as flaky.
>Index: LayoutTests/fast/js/activation-object-function-lifetime.html
>===================================================================
>--- LayoutTests/fast/js/activation-object-function-lifetime.html	(revision 122551)
>+++ LayoutTests/fast/js/activation-object-function-lifetime.html	(working copy)
>@@ -4,8 +4,8 @@ REGRESSION(r27344): Crash on load at fin
> <pre id="console"></pre>
> 
> <script>
>-if (this.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (this.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/add-to-primitive.html
>===================================================================
>--- LayoutTests/fast/js/add-to-primitive.html	(revision 122551)
>+++ LayoutTests/fast/js/add-to-primitive.html	(working copy)
>@@ -16,8 +16,8 @@ function shouldBe(a, aDescription, b)
>         log("FAIL: " + aDescription + " should be " + b + " but instead is " + a + ".");
> }
> 
>-if (this.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (this.testRunner)
>+    testRunner.dumpAsText();
>     
> var valueOfIsZero = {
>     valueOf: function valueOf() { return 0; },
>Index: LayoutTests/fast/js/array-foreach.html
>===================================================================
>--- LayoutTests/fast/js/array-foreach.html	(revision 122551)
>+++ LayoutTests/fast/js/array-foreach.html	(working copy)
>@@ -6,8 +6,8 @@ function print(str) {
>     document.writeln(str+"<br/>");
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> </head>
> <body>
>Index: LayoutTests/fast/js/array-indexof.html
>===================================================================
>--- LayoutTests/fast/js/array-indexof.html	(revision 122551)
>+++ LayoutTests/fast/js/array-indexof.html	(working copy)
>@@ -19,8 +19,8 @@ delete testArray4[1];
> var testArray5 = [5, 5, 5, undefined];
> delete testArray5[3];
> var testArray6 = new Array(20);
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> // -->
> </script>
>Index: LayoutTests/fast/js/array-map.html
>===================================================================
>--- LayoutTests/fast/js/array-map.html	(revision 122551)
>+++ LayoutTests/fast/js/array-map.html	(working copy)
>@@ -6,8 +6,8 @@ function print(str) {
>     document.writeln(str+"<br/>");
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> </head>
> <body>
>Index: LayoutTests/fast/js/array-some.html
>===================================================================
>--- LayoutTests/fast/js/array-some.html	(revision 122551)
>+++ LayoutTests/fast/js/array-some.html	(working copy)
>@@ -6,8 +6,8 @@ function print(str) {
>     document.writeln(str+"<br/>");
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> </head>
> <body>
>Index: LayoutTests/fast/js/bitwise-and-on-undefined.html
>===================================================================
>--- LayoutTests/fast/js/bitwise-and-on-undefined.html	(revision 122551)
>+++ LayoutTests/fast/js/bitwise-and-on-undefined.html	(working copy)
>@@ -10,7 +10,7 @@
>         </style>
>         <script type="text/javascript">
> 
>-            if (window.layoutTestController)  layoutTestController.dumpAsText();
>+            if (window.testRunner)  testRunner.dumpAsText();
> 
>             function log(msg) {
>                 document.getElementById("log").innerHTML += msg;
>Index: LayoutTests/fast/js/construct-global-object.html
>===================================================================
>--- LayoutTests/fast/js/construct-global-object.html	(revision 122551)
>+++ LayoutTests/fast/js/construct-global-object.html	(working copy)
>@@ -20,8 +20,8 @@ function shouldBe(a, aDescription, b)
>         log("FAIL: " + aDescription + " should be " + b + " but instead is " + a + ".");
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> frames[0].document.open();
> frames[0].document.write("<\script>function O() { }</script\>");
>Index: LayoutTests/fast/js/delete-function-parameter.html
>===================================================================
>--- LayoutTests/fast/js/delete-function-parameter.html	(revision 122551)
>+++ LayoutTests/fast/js/delete-function-parameter.html	(working copy)
>@@ -1,8 +1,8 @@
> <p>This page verifies that function parameters cannot be deleted.</p>
> <pre id="console"></pre>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/direct-entry-to-function-code.html
>===================================================================
>--- LayoutTests/fast/js/direct-entry-to-function-code.html	(revision 122551)
>+++ LayoutTests/fast/js/direct-entry-to-function-code.html	(working copy)
>@@ -1,5 +1,5 @@
> 
>-<body id="bodyNode" onload="document.write('<script' + '>' + 'var x = 0; var y = 1; var z = 2; if (window.layoutTestController) layoutTestController.dumpAsText(); document.write(\'<div>This test ensures that we can directly enter JS function code and re-enter globally without any initial global code being executed.</div>\')' + '</script' + '>');">
>+<body id="bodyNode" onload="document.write('<script' + '>' + 'var x = 0; var y = 1; var z = 2; if (window.testRunner) testRunner.dumpAsText(); document.write(\'<div>This test ensures that we can directly enter JS function code and re-enter globally without any initial global code being executed.</div>\')' + '</script' + '>');">
>     This test makes sure JS can enter a function directly without first executing global code.
> </body>
>Index: LayoutTests/fast/js/do-while-expression-value.html
>===================================================================
>--- LayoutTests/fast/js/do-while-expression-value.html	(revision 122551)
>+++ LayoutTests/fast/js/do-while-expression-value.html	(working copy)
>@@ -2,8 +2,8 @@
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/do-while-without-semicolon.html
>===================================================================
>--- LayoutTests/fast/js/do-while-without-semicolon.html	(revision 122551)
>+++ LayoutTests/fast/js/do-while-without-semicolon.html	(working copy)
>@@ -8,8 +8,8 @@ function pass()
>     document.getElementById("console").innerHTML = "PASS: Script following do/while statement executed.";
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> do{}while(false)pass();
> </script>
>Index: LayoutTests/fast/js/encode-URI-test.html
>===================================================================
>--- LayoutTests/fast/js/encode-URI-test.html	(revision 122551)
>+++ LayoutTests/fast/js/encode-URI-test.html	(working copy)
>@@ -11,7 +11,7 @@
> 
> <script type="text/javascript">
> 
>-if (window.layoutTestController)  layoutTestController.dumpAsText();
>+if (window.testRunner)  testRunner.dumpAsText();
> 
> // --------
> 
>Index: LayoutTests/fast/js/eval-cross-window.html
>===================================================================
>--- LayoutTests/fast/js/eval-cross-window.html	(revision 122551)
>+++ LayoutTests/fast/js/eval-cross-window.html	(working copy)
>@@ -12,8 +12,8 @@ associated with, eval throws an exceptio
> <iframe style="width:0; height:0"></iframe>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
>     
> var topEval = eval;
> var frameEval = frames[0].eval;
>Index: LayoutTests/fast/js/eval-keyword-vs-function.html
>===================================================================
>--- LayoutTests/fast/js/eval-keyword-vs-function.html	(revision 122551)
>+++ LayoutTests/fast/js/eval-keyword-vs-function.html	(working copy)
>@@ -12,8 +12,8 @@ into a global variable ("globalEval") or
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
>     
> var globalEval = eval;
> 
>Index: LayoutTests/fast/js/eval-overriding.html
>===================================================================
>--- LayoutTests/fast/js/eval-overriding.html	(revision 122551)
>+++ LayoutTests/fast/js/eval-overriding.html	(working copy)
>@@ -4,8 +4,8 @@
> <hr>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
>     
> var x = "built-in eval";
> 
>Index: LayoutTests/fast/js/exception-codegen-crash.html
>===================================================================
>--- LayoutTests/fast/js/exception-codegen-crash.html	(revision 122551)
>+++ LayoutTests/fast/js/exception-codegen-crash.html	(working copy)
>@@ -4,8 +4,8 @@
> </p>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> var scripts = [
>     "(1++).x;",
>Index: LayoutTests/fast/js/exception-sequencing-binops.js
>===================================================================
>--- LayoutTests/fast/js/exception-sequencing-binops.js	(revision 122551)
>+++ LayoutTests/fast/js/exception-sequencing-binops.js	(working copy)
>@@ -1,5 +1,5 @@
>-if (this.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (this.testRunner)
>+    testRunner.dumpAsText();
> 
> if (this.document) {
>     log = function(msg) {document.getElementById("log").innerHTML += msg + "<br />";};
>Index: LayoutTests/fast/js/exception-sequencing.html
>===================================================================
>--- LayoutTests/fast/js/exception-sequencing.html	(revision 122551)
>+++ LayoutTests/fast/js/exception-sequencing.html	(working copy)
>@@ -6,8 +6,8 @@ Test exception handling with various ari
> </ul>
> <div id="log"></div>
> <script>
>-if (this.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (this.testRunner)
>+    testRunner.dumpAsText();
> 
> if (this.document) {
>     log = function(msg) {document.getElementById("log").innerHTML += msg + "<br />";};
>Index: LayoutTests/fast/js/exception-thrown-from-equal.html
>===================================================================
>--- LayoutTests/fast/js/exception-thrown-from-equal.html	(revision 122551)
>+++ LayoutTests/fast/js/exception-thrown-from-equal.html	(working copy)
>@@ -18,8 +18,8 @@ function shouldThrow(expression, excepti
>         log("FAIL: " + expression + " should throw a " + exception + ", but didn't.");
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> var o = {
>     valueOf: function() {
>Index: LayoutTests/fast/js/exception-thrown-from-eval-inside-closure.html
>===================================================================
>--- LayoutTests/fast/js/exception-thrown-from-eval-inside-closure.html	(revision 122551)
>+++ LayoutTests/fast/js/exception-thrown-from-eval-inside-closure.html	(working copy)
>@@ -20,8 +20,8 @@ function shouldBe(aDescription, a, b)
>     }
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> // Create a function with an activation.
> (function () {
>Index: LayoutTests/fast/js/exception-thrown-from-function-with-lazy-activation.html
>===================================================================
>--- LayoutTests/fast/js/exception-thrown-from-function-with-lazy-activation.html	(revision 122551)
>+++ LayoutTests/fast/js/exception-thrown-from-function-with-lazy-activation.html	(working copy)
>@@ -20,8 +20,8 @@ function shouldBe(aDescription, a, b)
>     }
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> try {
>     // Lazily create an activation for a function that otherwise wouldn't need one, then throw.
>Index: LayoutTests/fast/js/exception-thrown-from-new.html
>===================================================================
>--- LayoutTests/fast/js/exception-thrown-from-new.html	(revision 122551)
>+++ LayoutTests/fast/js/exception-thrown-from-new.html	(working copy)
>@@ -20,8 +20,8 @@ function shouldBe(a, aDescription, b)
>     log ("FAIL: " + aDescription + " should be '" + String(b) + "' but instead is '" + String(a) + "'.");
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> (function () {
>     try {
>Index: LayoutTests/fast/js/exceptions-thrown-in-callbacks.html
>===================================================================
>--- LayoutTests/fast/js/exceptions-thrown-in-callbacks.html	(revision 122551)
>+++ LayoutTests/fast/js/exceptions-thrown-in-callbacks.html	(working copy)
>@@ -1,8 +1,8 @@
> This test ensures that exceptions are handled correctly by the various callback mechanisms present in WebCore.
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> var db = openDatabase("exception-info-test", "1.0", "Test for exception information thrown by callbacks and timers", 1);
>@@ -36,8 +36,8 @@ function dbStatementTest() {
> }
> 
> function timerTest() {
>-    if (window.layoutTestController)
>-        setTimeout("layoutTestController.notifyDone()", 0);
>+    if (window.testRunner)
>+        setTimeout("testRunner.notifyDone()", 0);
>     throw errorObject("timer");
> }
> 
>Index: LayoutTests/fast/js/exec-state-marking.html
>===================================================================
>--- LayoutTests/fast/js/exec-state-marking.html	(revision 122551)
>+++ LayoutTests/fast/js/exec-state-marking.html	(working copy)
>@@ -91,8 +91,8 @@ function f()
>     return v1 + v2 + v3 + v4 + v5;
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> shouldBe(f(), "f()", "12345");
> </script>
>Index: LayoutTests/fast/js/floating-point-truncate-rshift.html
>===================================================================
>--- LayoutTests/fast/js/floating-point-truncate-rshift.html	(revision 122551)
>+++ LayoutTests/fast/js/floating-point-truncate-rshift.html	(working copy)
>@@ -1,8 +1,8 @@
> <body>
> <script>
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> var largeNeg = -2715228072;
> if ((largeNeg >>> 5) == 49366850)
>Index: LayoutTests/fast/js/function-argument-evaluation-before-exception.html
>===================================================================
>--- LayoutTests/fast/js/function-argument-evaluation-before-exception.html	(revision 122551)
>+++ LayoutTests/fast/js/function-argument-evaluation-before-exception.html	(working copy)
>@@ -4,8 +4,8 @@ if the call throws a "not a function" ex
> <pre id="console">FAIL: arguments were not evaluated.</pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> window.__defineGetter__("x", function() { document.getElementById("console").innerHTML = "PASS: arguments were evaluated"; });
> 
>Index: LayoutTests/fast/js/function-argument-evaluation.html
>===================================================================
>--- LayoutTests/fast/js/function-argument-evaluation.html	(revision 122551)
>+++ LayoutTests/fast/js/function-argument-evaluation.html	(working copy)
>@@ -35,8 +35,8 @@ function test2(callback, x) {
> };
> 
> (function () {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     var callback = function callback(x) {
>         return x;
>Index: LayoutTests/fast/js/function-declarations.html
>===================================================================
>--- LayoutTests/fast/js/function-declarations.html	(revision 122551)
>+++ LayoutTests/fast/js/function-declarations.html	(working copy)
>@@ -2,8 +2,8 @@
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
>     
> function log(s)
> {
>Index: LayoutTests/fast/js/function-dot-arguments2.html
>===================================================================
>--- LayoutTests/fast/js/function-dot-arguments2.html	(revision 122551)
>+++ LayoutTests/fast/js/function-dot-arguments2.html	(working copy)
>@@ -23,8 +23,8 @@ function shouldBeNoEval(aDescription, a,
>     log("FAIL: " + aDescription + " should be " + b + " but instead is " + a + ".");
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> // eval should lazily create 'arguments'.
> function f1() {
>Index: LayoutTests/fast/js/function-dot-arguments-and-caller.html
>===================================================================
>--- LayoutTests/fast/js/function-dot-arguments-and-caller.html	(revision 122551)
>+++ LayoutTests/fast/js/function-dot-arguments-and-caller.html	(working copy)
>@@ -10,8 +10,8 @@ function log(s)
>     document.getElementById("console").appendChild(document.createTextNode(s + "\n"));
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function f() { return this.eval('f.arguments instanceof Object ? "PASS" : "FAIL"'); }
> 
>Index: LayoutTests/fast/js/function-prototype.html
>===================================================================
>--- LayoutTests/fast/js/function-prototype.html	(revision 122551)
>+++ LayoutTests/fast/js/function-prototype.html	(working copy)
>@@ -2,9 +2,9 @@
> <head>
> <script src="../js/resources/js-test-pre.js"></script>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.dumpAsText();
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
>+    testRunner.dumpAsText();
> }
> </script>
> </head>
>@@ -34,8 +34,8 @@ shouldBe("actual", "'function () { }'");
> </script>
> <script src="../js/resources/js-test-post.js"></script>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
> </script>
> </body>
> </html>
>Index: LayoutTests/fast/js/global-recursion-on-full-stack.html
>===================================================================
>--- LayoutTests/fast/js/global-recursion-on-full-stack.html	(revision 122551)
>+++ LayoutTests/fast/js/global-recursion-on-full-stack.html	(working copy)
>@@ -1,8 +1,8 @@
> This tests global code recursion when the JS stack is full.
> <div id="result">PASS: Entering global code with a full JS stack did not crash, and did not allow continued recursion.</id>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> var depth = 0;
> function f(a, b, c, d) {
>Index: LayoutTests/fast/js/global-var-limit.html
>===================================================================
>--- LayoutTests/fast/js/global-var-limit.html	(revision 122551)
>+++ LayoutTests/fast/js/global-var-limit.html	(working copy)
>@@ -4,8 +4,8 @@
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> var pass = "PASS: Existing global var survived.\n";
> 
>Index: LayoutTests/fast/js/implicit-global-to-global-reentry.html
>===================================================================
>--- LayoutTests/fast/js/implicit-global-to-global-reentry.html	(revision 122551)
>+++ LayoutTests/fast/js/implicit-global-to-global-reentry.html	(working copy)
>@@ -1,7 +1,7 @@
> This test ensure that global-to-global re-entry works correctly and does not clobber anything.  This passes if it does not crash.
> <script>
>-if (this.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (this.testRunner)
>+    testRunner.dumpAsText();
> try {
>     // The important part of the test is the global reentry from the document.write passed implicitly to eval
>     // the rest is just to ensure the test crahes reliably (errr... or something) if something goes wrong with
>Index: LayoutTests/fast/js/invalid-syntax-for-function.html
>===================================================================
>--- LayoutTests/fast/js/invalid-syntax-for-function.html	(revision 122551)
>+++ LayoutTests/fast/js/invalid-syntax-for-function.html	(working copy)
>@@ -3,6 +3,6 @@
>     https://bugs.webkit.org/show_bug.cgi?id=19025
> </body>
> <script>
>-if (this.layoutTestController)
>-   layoutTestController.dumpAsText();
>+if (this.testRunner)
>+   testRunner.dumpAsText();
> </script>
>Index: LayoutTests/fast/js/lexical-lookup-in-function-constructor.html
>===================================================================
>--- LayoutTests/fast/js/lexical-lookup-in-function-constructor.html	(revision 122551)
>+++ LayoutTests/fast/js/lexical-lookup-in-function-constructor.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> message = "FAILURE (Bad lookup)";
> function doTest() {
>Index: LayoutTests/fast/js/missing-style-end-tag-js.html
>===================================================================
>--- LayoutTests/fast/js/missing-style-end-tag-js.html	(revision 122551)
>+++ LayoutTests/fast/js/missing-style-end-tag-js.html	(working copy)
>@@ -3,9 +3,9 @@
> <style>
> .different { color: #0000ff; }
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.dumpPixels();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.dumpPixels();
>     }
> </script>
> <script src="resources/js-test-pre.js"></script>
>Index: LayoutTests/fast/js/navigator-language.html
>===================================================================
>--- LayoutTests/fast/js/navigator-language.html	(revision 122551)
>+++ LayoutTests/fast/js/navigator-language.html	(working copy)
>@@ -9,9 +9,9 @@ description(
>     "<pre>Check return value of navigator.language."
> );
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.setPOSIXLocale("en_US.iso88591");
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.setPOSIXLocale("en_US.iso88591");
> }
> 
> var language = navigator.language.toLowerCase();
>Index: LayoutTests/fast/js/navigator-plugins-crash.html
>===================================================================
>--- LayoutTests/fast/js/navigator-plugins-crash.html	(revision 122551)
>+++ LayoutTests/fast/js/navigator-plugins-crash.html	(working copy)
>@@ -1,8 +1,8 @@
> <html>
> <script>
> 
>-if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+if (window.testRunner)
>+        testRunner.dumpAsText();
> 
> var plugins = new Array;
> for (var i = 0; i < navigator.plugins.length; ++i) {
>Index: LayoutTests/fast/js/negate-overflow.html
>===================================================================
>--- LayoutTests/fast/js/negate-overflow.html	(revision 122551)
>+++ LayoutTests/fast/js/negate-overflow.html	(working copy)
>@@ -24,8 +24,8 @@ function shouldBe(aDescription, a, b)
> }
> 
> (function () {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     // Can be constant-folded by the parser.
>     var x = -(-2147483648);
>Index: LayoutTests/fast/js/nested-function-scope.html
>===================================================================
>--- LayoutTests/fast/js/nested-function-scope.html	(revision 122551)
>+++ LayoutTests/fast/js/nested-function-scope.html	(working copy)
>@@ -16,8 +16,8 @@ function shouldBe(evalA, a, b)
>     }
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> log("Before parsing f:");
> log("-----");
>Index: LayoutTests/fast/js/regexp-caching.html
>===================================================================
>--- LayoutTests/fast/js/regexp-caching.html	(revision 122551)
>+++ LayoutTests/fast/js/regexp-caching.html	(working copy)
>@@ -45,8 +45,8 @@ function printProperties(object)
> }
> 
> function test() {
>-    if (window.layoutTestController)  
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)  
>+        testRunner.dumpAsText();
> 
>     print("Properties of RegExp at startup:");
>     printPropertiesWithReadOnly(RegExp);
>Index: LayoutTests/fast/js/regexp-charclass-crash.html
>===================================================================
>--- LayoutTests/fast/js/regexp-charclass-crash.html	(revision 122551)
>+++ LayoutTests/fast/js/regexp-charclass-crash.html	(working copy)
>@@ -1,7 +1,7 @@
> <p>Tests a crash in the regular expression engine. If this test prints a PASS message, then it succeeded.</p>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> var string = "";
> for (i = 0; i < 1000; ++i)
>     string += "[[**]]";
>Index: LayoutTests/fast/js/regexp-test-null-string.html
>===================================================================
>--- LayoutTests/fast/js/regexp-test-null-string.html	(revision 122551)
>+++ LayoutTests/fast/js/regexp-test-null-string.html	(working copy)
>@@ -20,8 +20,8 @@ function shouldBe(a, aDescription, b)
>     log ("FAIL: " + aDescription + " should be '" + String(b) + "' but instead is '" + String(a) + "'.");
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> var result = /define/.test();
> shouldBe(result, "result", true);
>Index: LayoutTests/fast/js/same-origin-subframe-about-blank.html
>===================================================================
>--- LayoutTests/fast/js/same-origin-subframe-about-blank.html	(revision 122551)
>+++ LayoutTests/fast/js/same-origin-subframe-about-blank.html	(working copy)
>@@ -1,16 +1,16 @@
> <html>
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> 
> var target;
> function check_blank() {
>   var x = target.location.private;
>   result.innerHTML = "Test PASSED";
>-  if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+  if (window.testRunner)
>+    testRunner.notifyDone();
> }
> 
> function reload_blank() {
>Index: LayoutTests/fast/js/string-replace-exception-crash.html
>===================================================================
>--- LayoutTests/fast/js/string-replace-exception-crash.html	(revision 122551)
>+++ LayoutTests/fast/js/string-replace-exception-crash.html	(working copy)
>@@ -13,8 +13,8 @@ function log(s)
>     document.getElementById("console").appendChild(document.createTextNode(s + "\n"));
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> // these should not crash
> 
>Index: LayoutTests/fast/js/text-field-resize.html
>===================================================================
>--- LayoutTests/fast/js/text-field-resize.html	(revision 122551)
>+++ LayoutTests/fast/js/text-field-resize.html	(working copy)
>@@ -1,8 +1,8 @@
> <HTML>
> <HEAD>
> <SCRIPT>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/throw-from-array-sort.html
>===================================================================
>--- LayoutTests/fast/js/throw-from-array-sort.html	(revision 122551)
>+++ LayoutTests/fast/js/throw-from-array-sort.html	(working copy)
>@@ -9,8 +9,8 @@ function log(s)
>     document.getElementById("console").innerHTML = s + "\n";
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> var passed = true;
> 
>Index: LayoutTests/fast/js/toString-and-valueOf-override.html
>===================================================================
>--- LayoutTests/fast/js/toString-and-valueOf-override.html	(revision 122551)
>+++ LayoutTests/fast/js/toString-and-valueOf-override.html	(working copy)
>@@ -69,8 +69,8 @@
> 
>         function runTests()
>         {
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
> 
>             test('span', document.createElement('span'));
> 
>Index: LayoutTests/fast/js/toString-dontEnum.html
>===================================================================
>--- LayoutTests/fast/js/toString-dontEnum.html	(revision 122551)
>+++ LayoutTests/fast/js/toString-dontEnum.html	(working copy)
>@@ -21,8 +21,8 @@
> 
>         function runTests()
>         {
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
> 
>             // DOM objects with custom toString() functions
>             test(document.createElement('a'), "HTMLAnchorElement");
>Index: LayoutTests/fast/js/trivial-functions.html
>===================================================================
>--- LayoutTests/fast/js/trivial-functions.html	(revision 122551)
>+++ LayoutTests/fast/js/trivial-functions.html	(working copy)
>@@ -27,8 +27,8 @@ function shouldBe(aDescription, a, b)
> function f1(a, b) { return a[b]; }
> function f2(a, b, c) { return a[b] = c; }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> shouldBe("f1(0, 0)", f1(0, 0), undefined);
> shouldBe("f2(0, 0, 0)", f2(0, 0, 0), 0);
>Index: LayoutTests/fast/js/try-catch-crash.html
>===================================================================
>--- LayoutTests/fast/js/try-catch-crash.html	(revision 122551)
>+++ LayoutTests/fast/js/try-catch-crash.html	(working copy)
>@@ -1,8 +1,8 @@
> This test checks whether funky scope chains created by catch blocks
> are properly protected from GC. It should not crash.
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function Test_Error() {
>     for( var i = 0; i <= 5000; i++ ) {
>Index: LayoutTests/fast/js/uncaught-exception-line-number.html
>===================================================================
>--- LayoutTests/fast/js/uncaught-exception-line-number.html	(revision 122551)
>+++ LayoutTests/fast/js/uncaught-exception-line-number.html	(working copy)
>@@ -5,7 +5,7 @@ example for display in the JavaScript er
> look in the JS console for an uncaught exception on line 11.<br>
> 
> <script>
>-if (window.layoutTestController) layoutTestController.dumpAsText();
>+if (window.testRunner) testRunner.dumpAsText();
> 
> function foo() {
>   throw 'uh oh, an exception!';
>Index: LayoutTests/fast/js/var-declarations-shadowing.html
>===================================================================
>--- LayoutTests/fast/js/var-declarations-shadowing.html	(revision 122551)
>+++ LayoutTests/fast/js/var-declarations-shadowing.html	(working copy)
>@@ -10,8 +10,8 @@ If the test passes, you'll see a series 
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/var-declarations.html
>===================================================================
>--- LayoutTests/fast/js/var-declarations.html	(revision 122551)
>+++ LayoutTests/fast/js/var-declarations.html	(working copy)
>@@ -2,8 +2,8 @@
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
>     
> function log(s)
> {
>Index: LayoutTests/fast/js/vardecl-preserve-parameters.html
>===================================================================
>--- LayoutTests/fast/js/vardecl-preserve-parameters.html	(revision 122551)
>+++ LayoutTests/fast/js/vardecl-preserve-parameters.html	(working copy)
>@@ -3,8 +3,8 @@
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/vardecl-preserve-vardecl.html
>===================================================================
>--- LayoutTests/fast/js/vardecl-preserve-vardecl.html	(revision 122551)
>+++ LayoutTests/fast/js/vardecl-preserve-vardecl.html	(working copy)
>@@ -2,8 +2,8 @@
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/while-expression-value.html
>===================================================================
>--- LayoutTests/fast/js/while-expression-value.html	(revision 122551)
>+++ LayoutTests/fast/js/while-expression-value.html	(working copy)
>@@ -2,8 +2,8 @@
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/window-location-href-file-urls.html
>===================================================================
>--- LayoutTests/fast/js/window-location-href-file-urls.html	(revision 122551)
>+++ LayoutTests/fast/js/window-location-href-file-urls.html	(working copy)
>@@ -7,8 +7,8 @@ function debug(str) {
> }
> 
> function runTests() {
>-	if (window.layoutTestController)
>-		layoutTestController.dumpAsText();
>+	if (window.testRunner)
>+		testRunner.dumpAsText();
> 		
> 	var str = window.location.href;
> 	
>Index: LayoutTests/fast/js/mozilla/resources/js-test-post-async.js
>===================================================================
>--- LayoutTests/fast/js/mozilla/resources/js-test-post-async.js	(revision 122551)
>+++ LayoutTests/fast/js/mozilla/resources/js-test-post-async.js	(working copy)
>@@ -1,5 +1,5 @@
> shouldBeTrue("successfullyParsed");
> debug('<br /><span class="pass">TEST COMPLETE</span>');
> 
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
>Index: LayoutTests/fast/js/mozilla/resources/js-test-post.js
>===================================================================
>--- LayoutTests/fast/js/mozilla/resources/js-test-post.js	(revision 122551)
>+++ LayoutTests/fast/js/mozilla/resources/js-test-post.js	(working copy)
>@@ -1,8 +1,8 @@
> wasPostTestScriptParsed = true;
> 
> if (window.jsTestIsAsync) {
>-    if (window.layoutTestController)
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner)
>+        testRunner.waitUntilDone();
>     if (window.wasFinishJSTestCalled)
>         finishJSTest();
> } else
>Index: LayoutTests/fast/js/mozilla/resources/js-test-pre.js
>===================================================================
>--- LayoutTests/fast/js/mozilla/resources/js-test-pre.js	(revision 122551)
>+++ LayoutTests/fast/js/mozilla/resources/js-test-pre.js	(working copy)
>@@ -1,6 +1,6 @@
> // svg/dynamic-updates tests set enablePixelTesting=true, as we want to dump text + pixel results
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText(window.enablePixelTesting);
>+if (window.testRunner)
>+    testRunner.dumpAsText(window.enablePixelTesting);
> 
> function description(msg)
> {
>@@ -302,8 +302,8 @@ function finishJSTest()
>         return;
>     shouldBeTrue("successfullyParsed");
>     debug('<br /><span class="pass">TEST COMPLETE</span>');
>-    if (window.jsTestIsAsync && window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.jsTestIsAsync && window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> // shadow print()
>Index: LayoutTests/fast/js/pic/cached-array-length-access.html
>===================================================================
>--- LayoutTests/fast/js/pic/cached-array-length-access.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/cached-array-length-access.html	(working copy)
>@@ -8,8 +8,8 @@ below.
> 
> <script>
> (function() {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(s)
>     {
>Index: LayoutTests/fast/js/pic/cached-deleted-properties.html
>===================================================================
>--- LayoutTests/fast/js/pic/cached-deleted-properties.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/cached-deleted-properties.html	(working copy)
>@@ -7,8 +7,8 @@ properties. If the test passes, you'll s
> 
> <script>
> (function() {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(s)
>     {
>Index: LayoutTests/fast/js/pic/cached-getter-dictionary-and-proto.html
>===================================================================
>--- LayoutTests/fast/js/pic/cached-getter-dictionary-and-proto.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/cached-getter-dictionary-and-proto.html	(working copy)
>@@ -8,8 +8,8 @@ below.
> 
> <script>
> (function() {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(s)
>     {
>Index: LayoutTests/fast/js/pic/cached-getter-setter.html
>===================================================================
>--- LayoutTests/fast/js/pic/cached-getter-setter.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/cached-getter-setter.html	(working copy)
>@@ -7,8 +7,8 @@ you'll see a series of PASS messages bel
> 
> <script>
> (function() {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(s)
>     {
>Index: LayoutTests/fast/js/pic/cached-named-property-getter.html
>===================================================================
>--- LayoutTests/fast/js/pic/cached-named-property-getter.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/cached-named-property-getter.html	(working copy)
>@@ -7,8 +7,8 @@ you'll see a series of PASS messages bel
> 
> <script>
> (function() {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(s)
>     {
>Index: LayoutTests/fast/js/pic/cached-prototype-setter.html
>===================================================================
>--- LayoutTests/fast/js/pic/cached-prototype-setter.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/cached-prototype-setter.html	(working copy)
>@@ -4,8 +4,8 @@ If the test passes, you'll see two PASS 
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/pic/cached-prototype-then-immediate.html
>===================================================================
>--- LayoutTests/fast/js/pic/cached-prototype-then-immediate.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/cached-prototype-then-immediate.html	(working copy)
>@@ -4,8 +4,8 @@ If the test passes, you'll see two PASS 
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/pic/cached-single-entry-transition.html
>===================================================================
>--- LayoutTests/fast/js/pic/cached-single-entry-transition.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/cached-single-entry-transition.html	(working copy)
>@@ -8,8 +8,8 @@ you'll see a PASS message below.
> 
> <script>
> (function() {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(s)
>     {
>Index: LayoutTests/fast/js/pic/delete-global-object.html
>===================================================================
>--- LayoutTests/fast/js/pic/delete-global-object.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/delete-global-object.html	(working copy)
>@@ -7,8 +7,8 @@ had a property deleted. If the test pass
> 
> <script>
> (function() {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(s)
>     {
>Index: LayoutTests/fast/js/pic/dictionary-prototype.html
>===================================================================
>--- LayoutTests/fast/js/pic/dictionary-prototype.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/dictionary-prototype.html	(working copy)
>@@ -7,8 +7,8 @@ to dictionary status. If the test passes
> 
> <script>
> (function() {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(s)
>     {
>Index: LayoutTests/fast/js/pic/get-empty-string.html
>===================================================================
>--- LayoutTests/fast/js/pic/get-empty-string.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/get-empty-string.html	(working copy)
>@@ -6,8 +6,8 @@ you'll see a PASS message below.
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> (function() {
>     function log(s)
>Index: LayoutTests/fast/js/pic/get-set-proxy-object.html
>===================================================================
>--- LayoutTests/fast/js/pic/get-set-proxy-object.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/get-set-proxy-object.html	(working copy)
>@@ -6,8 +6,8 @@ you'll see a PASS message below.
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/pic/rehash-poisons-structure.html
>===================================================================
>--- LayoutTests/fast/js/pic/rehash-poisons-structure.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/rehash-poisons-structure.html	(working copy)
>@@ -8,8 +8,8 @@ test passes, you'll see a PASS message b
> 
> <script>
> (function() {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(s)
>     {
>Index: LayoutTests/fast/js/pic/undictionary.html
>===================================================================
>--- LayoutTests/fast/js/pic/undictionary.html	(revision 122551)
>+++ LayoutTests/fast/js/pic/undictionary.html	(working copy)
>@@ -6,8 +6,8 @@ If the test passes, you'll see a series 
> <pre id="console"></pre>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/fast/js/resources/fs-test-post.js
>===================================================================
>--- LayoutTests/fast/js/resources/fs-test-post.js	(revision 122551)
>+++ LayoutTests/fast/js/resources/fs-test-post.js	(working copy)
>@@ -1,6 +1,6 @@
> wasPostTestScriptParsed = true;
> 
>-if (window.layoutTestController)
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner)
>+    testRunner.waitUntilDone();
> if (window.wasFinishJSTestCalled)
>     finishJSTest();
>Index: LayoutTests/fast/js/resources/garbage-collect-after-string-appends.js-disabled
>===================================================================
>--- LayoutTests/fast/js/resources/garbage-collect-after-string-appends.js-disabled	(revision 122551)
>+++ LayoutTests/fast/js/resources/garbage-collect-after-string-appends.js-disabled	(working copy)
>@@ -6,8 +6,8 @@ description(
> // cost to the garbage collector.  It should be improved to be less tied to these implementation details.
> // <https://bugs.webkit.org/show_bug.cgi?id=20871>
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> if (window.GCController)
>     GCController.collect();
>Index: LayoutTests/fast/js/resources/js-test-post-async.js
>===================================================================
>--- LayoutTests/fast/js/resources/js-test-post-async.js	(revision 122551)
>+++ LayoutTests/fast/js/resources/js-test-post-async.js	(working copy)
>@@ -3,5 +3,5 @@ if (!errorMessage)
> shouldBeTrue("successfullyParsed");
> debug('<br /><span class="pass">TEST COMPLETE</span>');
> 
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
>Index: LayoutTests/fast/js/resources/js-test-post.js
>===================================================================
>--- LayoutTests/fast/js/resources/js-test-post.js	(revision 122551)
>+++ LayoutTests/fast/js/resources/js-test-post.js	(working copy)
>@@ -1,8 +1,8 @@
> wasPostTestScriptParsed = true;
> 
> if (window.jsTestIsAsync) {
>-    if (window.layoutTestController)
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner)
>+        testRunner.waitUntilDone();
>     if (window.wasFinishJSTestCalled)
>         finishJSTest();
> } else
>Index: LayoutTests/fast/js/resources/js-test-pre.js
>===================================================================
>--- LayoutTests/fast/js/resources/js-test-pre.js	(revision 122551)
>+++ LayoutTests/fast/js/resources/js-test-pre.js	(working copy)
>@@ -1,6 +1,6 @@
> // svg/dynamic-updates tests set enablePixelTesting=true, as we want to dump text + pixel results
>-if (self.layoutTestController)
>-    layoutTestController.dumpAsText(self.enablePixelTesting);
>+if (self.testRunner)
>+    testRunner.dumpAsText(self.enablePixelTesting);
> 
> var description, debug, successfullyParsed, errorMessage;
> 
>@@ -477,8 +477,8 @@ function finishJSTest()
>     if (!self.wasPostTestScriptParsed)
>         return;
>     isSuccessfullyParsed();
>-    if (self.jsTestIsAsync && self.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (self.jsTestIsAsync && self.testRunner)
>+        testRunner.notifyDone();
> }
> 
> function startWorker(testScriptURL, shared)
>Index: LayoutTests/fast/js/script-tests/cross-global-object-inline-global-var.js
>===================================================================
>--- LayoutTests/fast/js/script-tests/cross-global-object-inline-global-var.js	(revision 122551)
>+++ LayoutTests/fast/js/script-tests/cross-global-object-inline-global-var.js	(working copy)
>@@ -2,8 +2,8 @@ description(
> "This tests that function inlining in the DFG JIT doesn't get confused by different global objects."
> );
> 
>-if (window.layoutTestController)
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner)
>+    testRunner.waitUntilDone();
> 
> var b = 321;
> 
>@@ -19,7 +19,7 @@ function done(value) {
>         testPassed("done() called with " + expected);
>     else
>         testFailed("done() called with " + value + ", but expected " + expected);
>-    layoutTestController.notifyDone();
>+    testRunner.notifyDone();
> }
> 
> function doit() {
>Index: LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js
>===================================================================
>--- LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js	(revision 122551)
>+++ LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js	(working copy)
>@@ -2,8 +2,8 @@ description(
> "This tests that function inlining in the DFG JIT doesn't get confused about the global object to use for array allocation."
> );
> 
>-if (window.layoutTestController)
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner)
>+    testRunner.waitUntilDone();
> 
> function foo(x) {
>     return [x, x + 1, x * 2];
>@@ -17,7 +17,7 @@ function done(value) {
>         testPassed("done() called with " + expected);
>     else
>         testFailed("done() called with " + value + ", but expected " + expected);
>-    layoutTestController.notifyDone();
>+    testRunner.notifyDone();
> }
> 
> function doit() {
>Index: LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js
>===================================================================
>--- LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js	(revision 122551)
>+++ LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js	(working copy)
>@@ -2,8 +2,8 @@ description(
> "This tests that function inlining in the DFG JIT doesn't get confused about the global object to use for array allocation."
> );
> 
>-if (window.layoutTestController)
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner)
>+    testRunner.waitUntilDone();
> 
> function foo() {
>     return [1, 2, 3];
>@@ -17,7 +17,7 @@ function done(value) {
>         testPassed("done() called with " + expected);
>     else
>         testFailed("done() called with " + value + ", but expected " + expected);
>-    layoutTestController.notifyDone();
>+    testRunner.notifyDone();
> }
> 
> function doit() {
>Index: LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js
>===================================================================
>--- LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js	(revision 122551)
>+++ LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js	(working copy)
>@@ -2,8 +2,8 @@ description(
> "This tests that function inlining in the DFG JIT doesn't get confused about the global object to use for array allocation."
> );
> 
>-if (window.layoutTestController)
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner)
>+    testRunner.waitUntilDone();
> 
> function foo() {
>     return new Array(1, 2, 3);
>@@ -17,7 +17,7 @@ function done(value) {
>         testPassed("done() called with " + expected);
>     else
>         testFailed("done() called with " + value + ", but expected " + expected);
>-    layoutTestController.notifyDone();
>+    testRunner.notifyDone();
> }
> 
> function doit() {
>Index: LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js
>===================================================================
>--- LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js	(revision 122551)
>+++ LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js	(working copy)
>@@ -2,8 +2,8 @@ description(
> "This tests that function inlining in the DFG JIT doesn't get confused about the global object to use for array allocation."
> );
> 
>-if (window.layoutTestController)
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner)
>+    testRunner.waitUntilDone();
> 
> function foo() {
>     return new Array(1000);
>@@ -17,7 +17,7 @@ function done(value) {
>         testPassed("done() called with " + expected);
>     else
>         testFailed("done() called with " + value + ", but expected " + expected);
>-    layoutTestController.notifyDone();
>+    testRunner.notifyDone();
> }
> 
> function doit() {
>Index: LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array.js
>===================================================================
>--- LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array.js	(revision 122551)
>+++ LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array.js	(working copy)
>@@ -2,8 +2,8 @@ description(
> "This tests that function inlining in the DFG JIT doesn't get confused about the global object to use for array allocation."
> );
> 
>-if (window.layoutTestController)
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner)
>+    testRunner.waitUntilDone();
> 
> function foo() {
>     return new Array();
>@@ -17,7 +17,7 @@ function done(value) {
>         testPassed("done() called with " + expected);
>     else
>         testFailed("done() called with " + value + ", but expected " + expected);
>-    layoutTestController.notifyDone();
>+    testRunner.notifyDone();
> }
> 
> function doit() {
>Index: LayoutTests/fast/layers/add-layer-with-nested-stacking.html
>===================================================================
>--- LayoutTests/fast/layers/add-layer-with-nested-stacking.html	(revision 122551)
>+++ LayoutTests/fast/layers/add-layer-with-nested-stacking.html	(working copy)
>@@ -19,11 +19,11 @@
>         document.getElementById("test").style.display = "block";
>     }
> 
>-    if (!window.layoutTestController)
>+    if (!window.testRunner)
>         setTimeout(test, 0);
>     else {
>         document.body.offsetTop;
>-        layoutTestController.display();
>+        testRunner.display();
>         test();
>     }
> </script>
>Index: LayoutTests/fast/layers/assert-RenderLayer-update-positions.html
>===================================================================
>--- LayoutTests/fast/layers/assert-RenderLayer-update-positions.html	(revision 122551)
>+++ LayoutTests/fast/layers/assert-RenderLayer-update-positions.html	(working copy)
>@@ -22,16 +22,16 @@
>                     </div>
>                 </div>
>                 <script>
>-                    if (window.layoutTestController) {
>-                        layoutTestController.dumpAsText();
>-                        layoutTestController.waitUntilDone();
>+                    if (window.testRunner) {
>+                        testRunner.dumpAsText();
>+                        testRunner.waitUntilDone();
>                     }
> 
>                     function assert() {
>                         var dimensionsContainer = document.getElementById("assertTrigger");
>                         dimensionsContainer.setAttribute("class", "");
>-                        if (window.layoutTestController)
>-                            layoutTestController.notifyDone();
>+                        if (window.testRunner)
>+                            testRunner.notifyDone();
>                     }
> 
>                     // Asynchronously change the style to force a style recalc later.
>Index: LayoutTests/fast/layers/clip-rects-assertion.html
>===================================================================
>--- LayoutTests/fast/layers/clip-rects-assertion.html	(revision 122551)
>+++ LayoutTests/fast/layers/clip-rects-assertion.html	(working copy)
>@@ -24,8 +24,8 @@
>     }
>   </style>
>   <script>
>-    if (window.layoutTestController)
>-      layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+      testRunner.dumpAsText();
>     
>     function doTest()
>     {
>Index: LayoutTests/fast/layers/clip-rects-transformed-2.html
>===================================================================
>--- LayoutTests/fast/layers/clip-rects-transformed-2.html	(revision 122551)
>+++ LayoutTests/fast/layers/clip-rects-transformed-2.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <p>
>     Test 2/2 for <i><a href="rdar://problem/7398987">rdar://problem/7398987</a>
>Index: LayoutTests/fast/layers/clip-rects-transformed.html
>===================================================================
>--- LayoutTests/fast/layers/clip-rects-transformed.html	(revision 122551)
>+++ LayoutTests/fast/layers/clip-rects-transformed.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <p>
>     Test 1/2 for <i><a href="rdar://problem/7398987">rdar://problem/7398987</a>
>Index: LayoutTests/fast/layers/generated-layer-scrollbar-crash.html
>===================================================================
>--- LayoutTests/fast/layers/generated-layer-scrollbar-crash.html	(revision 122551)
>+++ LayoutTests/fast/layers/generated-layer-scrollbar-crash.html	(working copy)
>@@ -9,8 +9,8 @@
>         }
>     </style>
>     <script>
>-        if (window.layoutTestController)
>-            layoutTestController.dumpAsText();
>+        if (window.testRunner)
>+            testRunner.dumpAsText();
>     </script>
> </head>
> <body>
>Index: LayoutTests/fast/layers/inline-dirty-z-order-lists.html
>===================================================================
>--- LayoutTests/fast/layers/inline-dirty-z-order-lists.html	(revision 122551)
>+++ LayoutTests/fast/layers/inline-dirty-z-order-lists.html	(working copy)
>@@ -16,9 +16,9 @@
>         document.getElementById("inner").style.display = "none";
>     }
> 
>-    if (window.layoutTestController) {
>+    if (window.testRunner) {
>         document.body.offsetTop;
>-        layoutTestController.display();
>+        testRunner.display();
>         test();
>     } else
>         setTimeout(test, 0);
>Index: LayoutTests/fast/layers/layer-content-visibility-change.html
>===================================================================
>--- LayoutTests/fast/layers/layer-content-visibility-change.html	(revision 122551)
>+++ LayoutTests/fast/layers/layer-content-visibility-change.html	(working copy)
>@@ -9,9 +9,9 @@
>     {
>         document.getElementById("inner").style.visibility = "visible";
>     }
>-    if (window.layoutTestController) {
>+    if (window.testRunner) {
>         document.body.offsetTop;
>-        layoutTestController.display();
>+        testRunner.display();
>         test();
>     } else
>         setTimeout(test, 0);
>Index: LayoutTests/fast/layers/layer-visibility.html
>===================================================================
>--- LayoutTests/fast/layers/layer-visibility.html	(revision 122551)
>+++ LayoutTests/fast/layers/layer-visibility.html	(working copy)
>@@ -13,8 +13,8 @@
> </style>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner)
>+    testRunner.waitUntilDone();
> 
> var node1;
> var node2;
>@@ -94,8 +94,8 @@ document.getElementById('22').style.setP
> // force layout
> document.body.offsetTop;
> 
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/fast/layers/nested-layers-1.html
>===================================================================
>--- LayoutTests/fast/layers/nested-layers-1.html	(revision 122551)
>+++ LayoutTests/fast/layers/nested-layers-1.html	(working copy)
>@@ -5,9 +5,9 @@
> function test()
> {
>     document.body.offsetTop;
>-    if (window.layoutTestController) {
>-        layoutTestController.display();
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.display();
>+        testRunner.dumpAsText();
>         finish();
>     } else {
>         window.setTimeout(finish, 50);
>Index: LayoutTests/fast/layers/nested-layers-2.html
>===================================================================
>--- LayoutTests/fast/layers/nested-layers-2.html	(revision 122551)
>+++ LayoutTests/fast/layers/nested-layers-2.html	(working copy)
>@@ -5,9 +5,9 @@
> function test()
> {
>     document.body.offsetTop;
>-    if (window.layoutTestController) {
>-        layoutTestController.display();
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.display();
>+        testRunner.dumpAsText();
>         finish();
>     } else {
>         window.setTimeout(finish, 50);
>Index: LayoutTests/fast/layers/nested-layers-3.html
>===================================================================
>--- LayoutTests/fast/layers/nested-layers-3.html	(revision 122551)
>+++ LayoutTests/fast/layers/nested-layers-3.html	(working copy)
>@@ -5,9 +5,9 @@
> function test()
> {
>     document.body.offsetTop;
>-    if (window.layoutTestController) {
>-        layoutTestController.display();
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.display();
>+        testRunner.dumpAsText();
>         finish();
>     } else {
>         window.setTimeout(finish, 50);
>Index: LayoutTests/fast/layers/nested-layers-4.html
>===================================================================
>--- LayoutTests/fast/layers/nested-layers-4.html	(revision 122551)
>+++ LayoutTests/fast/layers/nested-layers-4.html	(working copy)
>@@ -5,9 +5,9 @@
> function test()
> {
>     document.body.offsetTop;
>-    if (window.layoutTestController) {
>-        layoutTestController.display();
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.display();
>+        testRunner.dumpAsText();
>         finish();
>     } else {
>         window.setTimeout(finish, 50);
>Index: LayoutTests/fast/layers/remove-layer-with-nested-stacking.html
>===================================================================
>--- LayoutTests/fast/layers/remove-layer-with-nested-stacking.html	(revision 122551)
>+++ LayoutTests/fast/layers/remove-layer-with-nested-stacking.html	(working copy)
>@@ -11,11 +11,11 @@ The square should be a uniform shade of 
>         document.getElementById("inner").style.float = "none";
>     }
> 
>-    if (!window.layoutTestController)
>+    if (!window.testRunner)
>         setTimeout(test, 0);
>     else {
>         document.body.offsetTop;
>-        layoutTestController.display();
>+        testRunner.display();
>         test();
>     }
> </script>
>Index: LayoutTests/fast/layers/remove-only-this-layer-update.html
>===================================================================
>--- LayoutTests/fast/layers/remove-only-this-layer-update.html	(revision 122551)
>+++ LayoutTests/fast/layers/remove-only-this-layer-update.html	(working copy)
>@@ -8,11 +8,11 @@ You should see a 100x100 green rect at 1
>     <script>
>         function doTest() {
>             document.getElementById("outer").style.opacity = 1.0;
>-            if (window.layoutTestController)
>-                layoutTestController.notifyDone();
>+            if (window.testRunner)
>+                testRunner.notifyDone();
>         }
>-        if (window.layoutTestController)
>-            layoutTestController.waitUntilDone();
>+        if (window.testRunner)
>+            testRunner.waitUntilDone();
>         // Delay until after the first paint
>         setTimeout(doTest, 0);
>     </script>
>Index: LayoutTests/fast/layers/removed-by-scroll-handler.html
>===================================================================
>--- LayoutTests/fast/layers/removed-by-scroll-handler.html	(revision 122551)
>+++ LayoutTests/fast/layers/removed-by-scroll-handler.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.waitUntilDone();
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.waitUntilDone();
>+        testRunner.dumpAsText();
>     }
> </script>
> <p>
>@@ -36,8 +36,8 @@
>         if (scrolledFirstContainer && scrolledSecondContainer) {
>             document.getElementById('result').innerText = "SUCCESS";
>         
>-            if (window.layoutTestController)
>-                layoutTestController.notifyDone();
>+            if (window.testRunner)
>+                testRunner.notifyDone();
>         }
>     }
> </script>
>Index: LayoutTests/fast/layers/resize-layer-deletion-crash.html
>===================================================================
>--- LayoutTests/fast/layers/resize-layer-deletion-crash.html	(revision 122551)
>+++ LayoutTests/fast/layers/resize-layer-deletion-crash.html	(working copy)
>@@ -3,16 +3,16 @@
>     <script>
>         function test()
>         {
>-            if (!window.layoutTestController)
>+            if (!window.testRunner)
>                 return;
>-            layoutTestController.dumpAsText();
>+            testRunner.dumpAsText();
>             document.body.offsetTop;
>             eventSender.mouseMoveTo(50, 50);
>             eventSender.mouseDown();
>             eventSender.mouseMoveTo(125, 125);
>             eventSender.mouseMoveTo(135, 135);
>             eventSender.mouseUp();
>-            layoutTestController.notifyDone();
>+            testRunner.notifyDone();
>         }
>     </script>
> </head>
>Index: LayoutTests/fast/layers/scroll-with-transform-composited-layer.html
>===================================================================
>--- LayoutTests/fast/layers/scroll-with-transform-composited-layer.html	(revision 122551)
>+++ LayoutTests/fast/layers/scroll-with-transform-composited-layer.html	(working copy)
>@@ -21,8 +21,8 @@
>     }
> </style>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText(true);
>+    if (window.testRunner)
>+        testRunner.dumpAsText(true);
> </script>
> </head>
> <body>
>Index: LayoutTests/fast/layers/scroll-with-transform-layer.html
>===================================================================
>--- LayoutTests/fast/layers/scroll-with-transform-layer.html	(revision 122551)
>+++ LayoutTests/fast/layers/scroll-with-transform-layer.html	(working copy)
>@@ -21,8 +21,8 @@
>     }
> </style>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText(true);
>+    if (window.testRunner)
>+        testRunner.dumpAsText(true);
> </script>
> </head>
> <body>
>Index: LayoutTests/fast/layers/scrollByLines-overflow-no-layer.html
>===================================================================
>--- LayoutTests/fast/layers/scrollByLines-overflow-no-layer.html	(revision 122551)
>+++ LayoutTests/fast/layers/scrollByLines-overflow-no-layer.html	(working copy)
>@@ -9,8 +9,8 @@
>     }
> </style>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function testScrollByLine()
>     {
>Index: LayoutTests/fast/layers/visible-layer-with-hidden-parent.html
>===================================================================
>--- LayoutTests/fast/layers/visible-layer-with-hidden-parent.html	(revision 122551)
>+++ LayoutTests/fast/layers/visible-layer-with-hidden-parent.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.waitUntilDone();
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.waitUntilDone();
>+        testRunner.dumpAsText();
>     }
> </script>
> 
>@@ -15,8 +15,8 @@
>     window.addEventListener('load', function() {
>         window.setTimeout(function() {
>             document.getElementById("container").style.visibility = "visible";
>-            if (window.layoutTestController)
>-                layoutTestController.notifyDone();
>+            if (window.testRunner)
>+                testRunner.notifyDone();
>         }, 0);
>     }, false);
> </script>
>Index: LayoutTests/fast/layers/zindex-hit-test.html
>===================================================================
>--- LayoutTests/fast/layers/zindex-hit-test.html	(revision 122551)
>+++ LayoutTests/fast/layers/zindex-hit-test.html	(working copy)
>@@ -19,8 +19,8 @@
>   }
>   </style>
>   <script type="text/javascript" charset="utf-8">
>-    if (window.layoutTestController)
>-      layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+      testRunner.dumpAsText();
> 
>     function runTest()
>     {
>Index: LayoutTests/fast/leaks/001.html
>===================================================================
>--- LayoutTests/fast/leaks/001.html	(revision 122551)
>+++ LayoutTests/fast/leaks/001.html	(working copy)
>@@ -8,8 +8,8 @@
>    span { color: black; }
>   </style>
>   <script>
>-   if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+   if (window.testRunner)
>+    testRunner.dumpAsText();
>   </script>
>  </head>
>  <body>
>Index: LayoutTests/fast/leaks/002.html
>===================================================================
>--- LayoutTests/fast/leaks/002.html	(revision 122551)
>+++ LayoutTests/fast/leaks/002.html	(working copy)
>@@ -8,8 +8,8 @@ particular meaning.
> <script>
> window.onload = function main() 
> {
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     // Repeat, to generate lots of leaks.
>     for (var i = 0; i < 20; i++) { //>
>Index: LayoutTests/fast/leaks/003.html-disabled
>===================================================================
>--- LayoutTests/fast/leaks/003.html-disabled	(revision 122551)
>+++ LayoutTests/fast/leaks/003.html-disabled	(working copy)
>@@ -15,13 +15,13 @@ var wiggleRoom = 20;
> 
> window.onload = function main()
> {
>-    if (!window.layoutTestController || !window.GCController) {
>-        log("FAIL: This test uses the layoutTestController and the GCController, so it can only run in DumpRenderTree.\n");
>+    if (!window.testRunner || !window.GCController) {
>+        log("FAIL: This test uses the testRunner and the GCController, so it can only run in DumpRenderTree.\n");
>         return;
>     }
>     
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> 
>     // Start with no garbage, so GC doesn't run automatically during the test.
>     GCController.collect();
>@@ -54,7 +54,7 @@ window.onload = function main()
>             log("PASS: " + wiggleRoom + " garbage JS objects or fewer left uncollected after destroying a frame.\n");
>         }
> 
>-        layoutTestController.notifyDone();
>+        testRunner.notifyDone();
>     }
>     setTimeout(continueTest, 10);
> }
>Index: LayoutTests/fast/line-grid/line-grid-nested.html
>===================================================================
>--- LayoutTests/fast/line-grid/line-grid-nested.html	(revision 122551)
>+++ LayoutTests/fast/line-grid/line-grid-nested.html	(working copy)
>@@ -7,8 +7,8 @@
>   }
> </style>
> <script>
>-if (window.layoutTestController)
>-    window.layoutTestController.dumpAsText()
>+if (window.testRunner)
>+    window.testRunner.dumpAsText()
> </script>
> 
> <body>
>Index: LayoutTests/fast/lists/alpha-boundary-values.html
>===================================================================
>--- LayoutTests/fast/lists/alpha-boundary-values.html	(revision 122551)
>+++ LayoutTests/fast/lists/alpha-boundary-values.html	(working copy)
>@@ -19,8 +19,8 @@
> </ol>
> <script src="resources/dump-list.js"></script>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         filterListsWithReplacement(document.querySelectorAll("ol"));
>     }
> </script>
>Index: LayoutTests/fast/lists/alpha-list-wrap.html
>===================================================================
>--- LayoutTests/fast/lists/alpha-list-wrap.html	(revision 122551)
>+++ LayoutTests/fast/lists/alpha-list-wrap.html	(working copy)
>@@ -9,8 +9,8 @@ for (var n = 1; n < 60; n++) {
> </script>
> <script src="resources/dump-list.js"></script>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         filterListsWithReplacement([document.getElementById("test")]);
>     }
> </script>
>Index: LayoutTests/fast/lists/calc-width-with-space.html
>===================================================================
>--- LayoutTests/fast/lists/calc-width-with-space.html	(revision 122551)
>+++ LayoutTests/fast/lists/calc-width-with-space.html	(working copy)
>@@ -16,8 +16,8 @@ function run()
>         result.appendChild(document.createTextNode("FAILED"));
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> </head>
> 
>Index: LayoutTests/fast/lists/decimal-leading-zero.html
>===================================================================
>--- LayoutTests/fast/lists/decimal-leading-zero.html	(revision 122551)
>+++ LayoutTests/fast/lists/decimal-leading-zero.html	(working copy)
>@@ -24,8 +24,8 @@
> </ol>
> <script src="resources/dump-list.js"></script>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         filterListsWithReplacement(document.querySelectorAll("ol"));
>     }
> </script>
>Index: LayoutTests/fast/lists/drag-into-marker.html
>===================================================================
>--- LayoutTests/fast/lists/drag-into-marker.html	(revision 122551)
>+++ LayoutTests/fast/lists/drag-into-marker.html	(working copy)
>@@ -7,10 +7,10 @@
> <script>
> 
> function runTest() {
>-    if (!window.layoutTestController)
>+    if (!window.testRunner)
>         return;
> 
>-    window.layoutTestController.waitUntilDone();
>+    window.testRunner.waitUntilDone();
>     
>     var spanToDrag = document.getElementById("spanToDrag");
>     var x = spanToDrag.offsetLeft + spanToDrag.offsetWidth / 2;
>@@ -40,7 +40,7 @@ function runTest() {
>     eventSender.mouseMoveTo(x, y);
>     eventSender.mouseUp();
> 
>-    window.layoutTestController.notifyDone();
>+    window.testRunner.notifyDone();
> }
> 
> runTest();
>Index: LayoutTests/fast/lists/item-not-in-list-line-wrapping.html
>===================================================================
>--- LayoutTests/fast/lists/item-not-in-list-line-wrapping.html	(revision 122551)
>+++ LayoutTests/fast/lists/item-not-in-list-line-wrapping.html	(working copy)
>@@ -25,8 +25,8 @@
>         else
>             result.innerHTML = "FAILED: text.offsetWidth=" + text.offsetWidth;
> 
>-        if (window.layoutTestController)
>-            layoutTestController.dumpAsText();
>+        if (window.testRunner)
>+            testRunner.dumpAsText();
>     </script>
> </body>
> </html>
>Index: LayoutTests/fast/lists/li-values.html
>===================================================================
>--- LayoutTests/fast/lists/li-values.html	(revision 122551)
>+++ LayoutTests/fast/lists/li-values.html	(working copy)
>@@ -6,15 +6,15 @@ function finishTest()
>     document.getElementById("removeMyValue").removeAttribute("value");
>     document.getElementById("changeMyValue").setAttribute("value", "-5");
>     filterListsWithReplacement(document.querySelectorAll("ol"));
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> function init()
> {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
>     setTimeout(finishTest, 0);
> }
>Index: LayoutTests/fast/lists/list-style-type-dynamic-change.html
>===================================================================
>--- LayoutTests/fast/lists/list-style-type-dynamic-change.html	(revision 122551)
>+++ LayoutTests/fast/lists/list-style-type-dynamic-change.html	(working copy)
>@@ -21,8 +21,8 @@
>     </script>
>     <script src="resources/dump-list.js"></script>
>     <script>
>-        if (window.layoutTestController) {
>-            layoutTestController.dumpAsText();
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>             filterListsWithReplacement([document.getElementById("list")]);
>         }
>     </script>
>Index: LayoutTests/fast/lists/ol-nested-items-dynamic-insert.html
>===================================================================
>--- LayoutTests/fast/lists/ol-nested-items-dynamic-insert.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-nested-items-dynamic-insert.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list = document.getElementById("list");
>                 list.offsetTop; // Force a relayout.
>Index: LayoutTests/fast/lists/ol-nested-items-dynamic-remove.html
>===================================================================
>--- LayoutTests/fast/lists/ol-nested-items-dynamic-remove.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-nested-items-dynamic-remove.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list = document.getElementById("list");
>                 list.offsetTop; // Force a relayout.
>Index: LayoutTests/fast/lists/ol-nested-items.html
>===================================================================
>--- LayoutTests/fast/lists/ol-nested-items.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-nested-items.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list = document.getElementById("list");
>                 document.getElementById("console").innerHTML = dumpList(list);
>Index: LayoutTests/fast/lists/ol-nested-list-dynamic-insert.html
>===================================================================
>--- LayoutTests/fast/lists/ol-nested-list-dynamic-insert.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-nested-list-dynamic-insert.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list = document.getElementById("list");
>                 list.offsetTop; // Force a relayout.
>Index: LayoutTests/fast/lists/ol-nested-list-dynamic-remove.html
>===================================================================
>--- LayoutTests/fast/lists/ol-nested-list-dynamic-remove.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-nested-list-dynamic-remove.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list = document.getElementById("list");
>                 list.offsetTop; // Force a relayout.
>Index: LayoutTests/fast/lists/ol-nested-list.html
>===================================================================
>--- LayoutTests/fast/lists/ol-nested-list.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-nested-list.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list = document.getElementById("list");
>                 document.getElementById("console").innerHTML = dumpList(list);
>Index: LayoutTests/fast/lists/ol-reversed-dynamic-simple.html
>===================================================================
>--- LayoutTests/fast/lists/ol-reversed-dynamic-simple.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-reversed-dynamic-simple.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list1 = document.getElementById("list1");
>                 list1.offsetTop; // Force a relayout.
>Index: LayoutTests/fast/lists/ol-reversed-dynamic.html
>===================================================================
>--- LayoutTests/fast/lists/ol-reversed-dynamic.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-reversed-dynamic.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list1 = document.getElementById("list1");
>                 list1.offsetTop; // Force a relayout.
>Index: LayoutTests/fast/lists/ol-reversed-nested-items.html
>===================================================================
>--- LayoutTests/fast/lists/ol-reversed-nested-items.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-reversed-nested-items.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list = document.getElementById("list");
>                 document.getElementById("console").innerHTML = dumpList(list);
>Index: LayoutTests/fast/lists/ol-reversed-nested-list.html
>===================================================================
>--- LayoutTests/fast/lists/ol-reversed-nested-list.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-reversed-nested-list.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list = document.getElementById("list");
>                 document.getElementById("console").innerHTML = dumpList(list);
>Index: LayoutTests/fast/lists/ol-reversed-simple.html
>===================================================================
>--- LayoutTests/fast/lists/ol-reversed-simple.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-reversed-simple.html	(working copy)
>@@ -4,8 +4,8 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner)
>+                    testRunner.dumpAsText();
> 
>                 var list1 = document.getElementById("list1");
>                 document.getElementById("console1").innerHTML = dumpList(list1);
>Index: LayoutTests/fast/lists/ol-reversed-simple.xhtml
>===================================================================
>--- LayoutTests/fast/lists/ol-reversed-simple.xhtml	(revision 122551)
>+++ LayoutTests/fast/lists/ol-reversed-simple.xhtml	(working copy)
>@@ -5,8 +5,8 @@
>     <script>
>         function test()
>         {
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
> 
>             var list1 = document.getElementById("list1");
>             document.getElementById("console1").innerHTML = dumpList(list1);
>Index: LayoutTests/fast/lists/ol-start-roman.html
>===================================================================
>--- LayoutTests/fast/lists/ol-start-roman.html	(revision 122551)
>+++ LayoutTests/fast/lists/ol-start-roman.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <ol start="3888" type="i">
> <li>PASS: test did not crash, bug 31652.</li>
>Index: LayoutTests/fast/lists/parent-box-not-box-crash.html
>===================================================================
>--- LayoutTests/fast/lists/parent-box-not-box-crash.html	(revision 122551)
>+++ LayoutTests/fast/lists/parent-box-not-box-crash.html	(working copy)
>@@ -9,8 +9,8 @@
>             }
>         </style>
>         <script>
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
>         </script>
>     </head>
>     <body>
>Index: LayoutTests/fast/lists/positioned-count-crash.html
>===================================================================
>--- LayoutTests/fast/lists/positioned-count-crash.html	(revision 122551)
>+++ LayoutTests/fast/lists/positioned-count-crash.html	(working copy)
>@@ -12,8 +12,8 @@ For manual test: If you see no crash and
> 
> <script src="resources/dump-list.js"></script>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         document.write(testListItemMarkerEqualsListItemText(document.getElementById("test")));
>     }
> </script>
>Index: LayoutTests/fast/lists/remove-listmarker-from-anonblock-with-continuation-crash.html
>===================================================================
>--- LayoutTests/fast/lists/remove-listmarker-from-anonblock-with-continuation-crash.html	(revision 122551)
>+++ LayoutTests/fast/lists/remove-listmarker-from-anonblock-with-continuation-crash.html	(working copy)
>@@ -20,6 +20,6 @@ listItemElement.setAttribute('class', 'a
> document.documentElement.offsetHeight;
> listItemElement.setAttribute('class', 'colSpanAll');
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
>Index: LayoutTests/fast/lists/w3-css3-list-styles-alphabetic.html
>===================================================================
>--- LayoutTests/fast/lists/w3-css3-list-styles-alphabetic.html	(revision 122551)
>+++ LayoutTests/fast/lists/w3-css3-list-styles-alphabetic.html	(working copy)
>@@ -10,10 +10,10 @@
>     <script>
>         function runTest()
>         {
>-            if (!window.layoutTestController)
>+            if (!window.testRunner)
>                 return;
>                 
>-            layoutTestController.dumpAsText();
>+            testRunner.dumpAsText();
>             filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
>             document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
>         }
>Index: LayoutTests/fast/lists/w3-css3-list-styles-fallback-style.html
>===================================================================
>--- LayoutTests/fast/lists/w3-css3-list-styles-fallback-style.html	(revision 122551)
>+++ LayoutTests/fast/lists/w3-css3-list-styles-fallback-style.html	(working copy)
>@@ -52,10 +52,10 @@
>     <script>
>         function runTest()
>         {
>-            if (!window.layoutTestController)
>+            if (!window.testRunner)
>                 return;
>                 
>-            layoutTestController.dumpAsText();
>+            testRunner.dumpAsText();
>             filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
>             document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
>         }
>Index: LayoutTests/fast/lists/w3-css3-list-styles-numeric.html
>===================================================================
>--- LayoutTests/fast/lists/w3-css3-list-styles-numeric.html	(revision 122551)
>+++ LayoutTests/fast/lists/w3-css3-list-styles-numeric.html	(working copy)
>@@ -64,15 +64,15 @@
>         {
>             var isNegativeNumber = listItemElement.parentNode.className && listItemElement.parentNode.className.split(" ").indexOf("negative-number") > -1;
>             var expectedMarkerText = (isNegativeNumber ? "-" : "") + listItemElement.innerText;
>-            return testListItemMarkerEquals(layoutTestController.markerTextForListItem(listItemElement), expectedMarkerText);
>+            return testListItemMarkerEquals(testRunner.markerTextForListItem(listItemElement), expectedMarkerText);
>         }
> 
>         function runTest()
>         {
>-            if (!window.layoutTestController)
>+            if (!window.testRunner)
>                 return;
>             
>-            layoutTestController.dumpAsText();
>+            testRunner.dumpAsText();
>             filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
>             document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
>         }
>Index: LayoutTests/fast/lists/w3-css3-list-styles-symbolic.html
>===================================================================
>--- LayoutTests/fast/lists/w3-css3-list-styles-symbolic.html	(revision 122551)
>+++ LayoutTests/fast/lists/w3-css3-list-styles-symbolic.html	(working copy)
>@@ -17,10 +17,10 @@
>     <script>
>         function runTest()
>         {
>-            if (!window.layoutTestController)
>+            if (!window.testRunner)
>                 return;
>                 
>-            layoutTestController.dumpAsText();
>+            testRunner.dumpAsText();
>             filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
>             document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
>         }
>Index: LayoutTests/fast/lists/w3-css3-lower-armenian.html
>===================================================================
>--- LayoutTests/fast/lists/w3-css3-lower-armenian.html	(revision 122551)
>+++ LayoutTests/fast/lists/w3-css3-lower-armenian.html	(working copy)
>@@ -9,10 +9,10 @@
>     <script>
>         function runTest()
>         {
>-            if (!window.layoutTestController)
>+            if (!window.testRunner)
>                 return;
>                 
>-            layoutTestController.dumpAsText();
>+            testRunner.dumpAsText();
>             filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
>             document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
>         }
>Index: LayoutTests/fast/lists/w3-css3-upper-armenian.html
>===================================================================
>--- LayoutTests/fast/lists/w3-css3-upper-armenian.html	(revision 122551)
>+++ LayoutTests/fast/lists/w3-css3-upper-armenian.html	(working copy)
>@@ -9,10 +9,10 @@
>     <script>
>         function runTest()
>         {
>-            if (!window.layoutTestController)
>+            if (!window.testRunner)
>                 return;
>                 
>-            layoutTestController.dumpAsText();
>+            testRunner.dumpAsText();
>             filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
>             document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
>         }
>Index: LayoutTests/fast/lists/w3-list-styles.html
>===================================================================
>--- LayoutTests/fast/lists/w3-list-styles.html	(revision 122551)
>+++ LayoutTests/fast/lists/w3-list-styles.html	(working copy)
>@@ -23,8 +23,8 @@ ol ol { margin-bottom: 0em; margin-top: 
> <script>
>     window.onload = function()
>     {
>-        if (window.layoutTestController) {
>-            layoutTestController.dumpAsText();
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>             filterListsWithReplacement(document.querySelectorAll(".test ol"));
>         }
>     }
>Index: LayoutTests/fast/lists/resources/dump-list.js
>===================================================================
>--- LayoutTests/fast/lists/resources/dump-list.js	(revision 122551)
>+++ LayoutTests/fast/lists/resources/dump-list.js	(working copy)
>@@ -35,13 +35,13 @@ function processList(element, processLis
> 
> function dumpListItemAsHTML(listItemElement, depth)
> {
>-    var marker = layoutTestController.markerTextForListItem(listItemElement);
>+    var marker = testRunner.markerTextForListItem(listItemElement);
>     return marker ? indent(depth) + ' ' + marker + ' ' + listItemElement.innerText.trim() + '<br/>' : '';
> }
> 
> function testListItemMarkerEqualsListItemText(listItemElement, depth)
> {
>-    return testListItemMarkerEquals(layoutTestController.markerTextForListItem(listItemElement), listItemElement.innerText.trim());
>+    return testListItemMarkerEquals(testRunner.markerTextForListItem(listItemElement), listItemElement.innerText.trim());
> }
> 
> function testListItemMarkerEquals(actualMarkerText, expectedMarkerText)
>Index: LayoutTests/fast/loader/about-blank-hash-change.html
>===================================================================
>--- LayoutTests/fast/loader/about-blank-hash-change.html	(revision 122551)
>+++ LayoutTests/fast/loader/about-blank-hash-change.html	(working copy)
>@@ -9,8 +9,8 @@ https://bugs.webkit.org/show_bug.cgi?id=
> says "FAIL" then it fired two or more times. Also, the test may time out
> looping on this event handler (which is also a failure). If the text says "No callback" then something else is broken :)</p>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
> }
> 
> function onload_callback() {
>Index: LayoutTests/fast/loader/about-blank-hash-kept.html
>===================================================================
>--- LayoutTests/fast/loader/about-blank-hash-kept.html	(revision 122551)
>+++ LayoutTests/fast/loader/about-blank-hash-kept.html	(working copy)
>@@ -3,8 +3,8 @@
> <p>See <a href="https://bugs.webkit.org/show_bug.cgi?id=35399">
> https://bugs.webkit.org/show_bug.cgi?id=35399</a>.</p>
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
> }
> 
> function onload_callback() {
>Index: LayoutTests/fast/loader/api-test-go-to-current-back-forward-item.html-disabled
>===================================================================
>--- LayoutTests/fast/loader/api-test-go-to-current-back-forward-item.html-disabled	(revision 122551)
>+++ LayoutTests/fast/loader/api-test-go-to-current-back-forward-item.html-disabled	(working copy)
>@@ -1,19 +1,19 @@
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpFrameLoadCallbacks();
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
>+    testRunner.dumpAsText();
>+    testRunner.dumpFrameLoadCallbacks();
>     if (sessionStorage.api_goto_current_bf_item) {
>         delete sessionStorage.api_goto_current_bf_item;
>-        layoutTestController.notifyDone();
>+        testRunner.notifyDone();
>     }
> }
> 
> function loaded()
> {
>-    if (window.layoutTestController) {
>+    if (window.testRunner) {
>         sessionStorage.api_goto_current_bf_item = true;
>-        layoutTestController.apiTestGoToCurrentBackForwardItem();
>+        testRunner.apiTestGoToCurrentBackForwardItem();
>     }
> }
> 
>Index: LayoutTests/fast/loader/api-test-new-window-data-load-base-url.html-disabled
>===================================================================
>--- LayoutTests/fast/loader/api-test-new-window-data-load-base-url.html-disabled	(revision 122551)
>+++ LayoutTests/fast/loader/api-test-new-window-data-load-base-url.html-disabled	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
> 
>     var dataURL = "<a id='anchor' href='#foo'>Hello</a><br><div id='foo'></div><s" + "cript>" +
>                   "var evt = document.createEvent('MouseEvent');" +
>@@ -8,7 +8,7 @@ if (window.layoutTestController) {
>                   "document.getElementById('anchor').dispatchEvent(evt);" +
>                   "</s" + "cript>";
>     
>-    layoutTestController.apiTestNewWindowDataLoadBaseURL(dataURL, "http://example.com/example.html");
>+    testRunner.apiTestNewWindowDataLoadBaseURL(dataURL, "http://example.com/example.html");
> }
> </script>
> <body>
>Index: LayoutTests/fast/loader/cancel-load-during-port-block-timer.html
>===================================================================
>--- LayoutTests/fast/loader/cancel-load-during-port-block-timer.html	(revision 122551)
>+++ LayoutTests/fast/loader/cancel-load-during-port-block-timer.html	(working copy)
>@@ -1,14 +1,14 @@
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>-        layoutTestController.setCanOpenWindows();
>-        layoutTestController.setCloseRemainingWindowsWhenComplete();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>+        testRunner.setCanOpenWindows();
>+        testRunner.setCloseRemainingWindowsWhenComplete();
>     }
> 
>     window.open("http://127.0.0.1:22").document.write('');
> 
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> </script>
> If this does crash, the test has passed.
>Index: LayoutTests/fast/loader/charset-parse.html
>===================================================================
>--- LayoutTests/fast/loader/charset-parse.html	(revision 122551)
>+++ LayoutTests/fast/loader/charset-parse.html	(working copy)
>@@ -3,8 +3,8 @@
>         <meta http-equiv="Content-Type" content=char>
>         <meta http-equiv="Content-Type" content="chcharset=windows-1255" />
>         <script>
>-        if (window.layoutTestController)
>-            layoutTestController.dumpAsText();
>+        if (window.testRunner)
>+            testRunner.dumpAsText();
>         </script>
>     </head>
>     <body>
>Index: LayoutTests/fast/loader/child-frame-add-after-back-forward.html
>===================================================================
>--- LayoutTests/fast/loader/child-frame-add-after-back-forward.html	(revision 122551)
>+++ LayoutTests/fast/loader/child-frame-add-after-back-forward.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpChildFramesAsText();
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
>+    testRunner.dumpAsText();
>+    testRunner.dumpChildFramesAsText();
> }
> 
> function navigate() {
>Index: LayoutTests/fast/loader/crash-copying-backforwardlist.html
>===================================================================
>--- LayoutTests/fast/loader/crash-copying-backforwardlist.html	(revision 122551)
>+++ LayoutTests/fast/loader/crash-copying-backforwardlist.html	(working copy)
>@@ -2,16 +2,16 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.setCanOpenWindows(true);
>-    layoutTestController.setNewWindowsCopyBackForwardList(true);
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
>+    testRunner.setCanOpenWindows(true);
>+    testRunner.setNewWindowsCopyBackForwardList(true);
> }
> 
> </script>
> </head>
>-<body onload="window.open('data:text/html,<script>if (window.layoutTestController) layoutTestController.notifyDone();</script>');">
>+<body onload="window.open('data:text/html,<script>if (window.testRunner) testRunner.notifyDone();</script>');">
> <pre>
> This test only works in DRT by tickling the [WebView _loadBackForwardListFromOtherView:] method.
> If it doesn't crash, then the test passes.
>Index: LayoutTests/fast/loader/crash-replacing-location-before-load.html
>===================================================================
>--- LayoutTests/fast/loader/crash-replacing-location-before-load.html	(revision 122551)
>+++ LayoutTests/fast/loader/crash-replacing-location-before-load.html	(working copy)
>@@ -1,8 +1,8 @@
> <script>
> if (parent == window) {
>-  if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+  if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
>   }
>   function replaceHash(frag) {
>     frames[0].location.replace('#' + frag);
>@@ -13,8 +13,8 @@ if (parent == window) {
>     f.onload = function() {
>       delete f.onload;
>       replaceHash('bar');
>-      if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+      if (window.testRunner)
>+        testRunner.notifyDone();
>     }
>     document.body.appendChild(f);
>     replaceHash('foo');
>Index: LayoutTests/fast/loader/create-frame-in-DOMContentLoaded.html
>===================================================================
>--- LayoutTests/fast/loader/create-frame-in-DOMContentLoaded.html	(revision 122551)
>+++ LayoutTests/fast/loader/create-frame-in-DOMContentLoaded.html	(working copy)
>@@ -22,8 +22,8 @@ function handleLoadEvent()
>     print("D) Exiting load event handler function.");
>     print("Test passed if messages A, B, C, D were all in order and there was no crash.");
> }
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> addEventListener("load", handleLoadEvent);
> addEventListener("DOMContentLoaded", handleDOMContentLoadedEvent);
> </script>
>Index: LayoutTests/fast/loader/data-url-encoding-html.html
>===================================================================
>--- LayoutTests/fast/loader/data-url-encoding-html.html	(revision 122551)
>+++ LayoutTests/fast/loader/data-url-encoding-html.html	(working copy)
>@@ -3,8 +3,8 @@
> <p>Test that non-ASCII data: URLs are handled correctly.</p>
> <pre id=result></pre>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function test() {
>     document.getElementById("result").innerHTML += "1. " + (window.frames[0].document.body.innerHTML == "ðÒÏ×ÅÒËÁ" ? "SUCCESS" : "FAILURE") + ".\r";
>Index: LayoutTests/fast/loader/data-url-encoding-svg.html
>===================================================================
>--- LayoutTests/fast/loader/data-url-encoding-svg.html	(revision 122551)
>+++ LayoutTests/fast/loader/data-url-encoding-svg.html	(working copy)
>@@ -1,8 +1,8 @@
> <meta charset="koi8-r">
> <body onload="test()">
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function result(i) {
>     return window.frames[i].document.documentElement.getAttribute("test");
>Index: LayoutTests/fast/loader/document-destruction-within-unload.html
>===================================================================
>--- LayoutTests/fast/loader/document-destruction-within-unload.html	(revision 122551)
>+++ LayoutTests/fast/loader/document-destruction-within-unload.html	(working copy)
>@@ -1,14 +1,14 @@
> <html>
> <body>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function done() {
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> </script>
> <iframe src="resources/document-destruction-within-unload-iframe.html"></iframe>
>Index: LayoutTests/fast/loader/document-with-fragment-url-1.html
>===================================================================
>--- LayoutTests/fast/loader/document-with-fragment-url-1.html	(revision 122551)
>+++ LayoutTests/fast/loader/document-with-fragment-url-1.html	(working copy)
>@@ -5,9 +5,9 @@ if (!sessionStorage.in_document_with_fra
> else
>     delete sessionStorage.in_document_with_fragment_url_1;
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function documentURLHash()
>@@ -42,8 +42,8 @@ function loaded()
>         eventSender.mouseUp();
>     } else {
>         alert("Second load complete.  URL's current hash is " + documentURLHash());
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }
> }
> 
>Index: LayoutTests/fast/loader/document-with-fragment-url-2.html
>===================================================================
>--- LayoutTests/fast/loader/document-with-fragment-url-2.html	(revision 122551)
>+++ LayoutTests/fast/loader/document-with-fragment-url-2.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.dumpAsText();
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
>+    testRunner.dumpAsText();
> }
> 
> location = "resources/document-with-fragment-url-test.html#foo";
>Index: LayoutTests/fast/loader/document-with-fragment-url-3.html
>===================================================================
>--- LayoutTests/fast/loader/document-with-fragment-url-3.html	(revision 122551)
>+++ LayoutTests/fast/loader/document-with-fragment-url-3.html	(working copy)
>@@ -5,9 +5,9 @@ if (!sessionStorage.in_document_with_fra
> else
>     delete sessionStorage.in_document_with_fragment_url_3;
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function documentURLHash()
>@@ -35,8 +35,8 @@ function loaded()
>         eventSender.mouseUp();
>     } else {
>         alert("Second load complete.  URL's current hash is " + documentURLHash());
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }
> }
> 
>Index: LayoutTests/fast/loader/document-with-fragment-url-4.html
>===================================================================
>--- LayoutTests/fast/loader/document-with-fragment-url-4.html	(revision 122551)
>+++ LayoutTests/fast/loader/document-with-fragment-url-4.html	(working copy)
>@@ -5,9 +5,9 @@ if (!sessionStorage.in_document_with_fra
> else
>     delete sessionStorage.in_document_with_fragment_url_4;
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function documentURLHash()
>@@ -35,8 +35,8 @@ function loaded()
>         eventSender.mouseUp();
>     } else {
>         alert("Second load complete.  URL's current hash is " + documentURLHash());
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }
> }
> 
>Index: LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-item.html
>===================================================================
>--- LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-item.html	(revision 122551)
>+++ LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-item.html	(working copy)
>@@ -1,8 +1,8 @@
> <script>
>-if (window.layoutTestController) {
>-   layoutTestController.dumpAsText();
>-   layoutTestController.dumpBackForwardList();
>-   layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+   testRunner.dumpAsText();
>+   testRunner.dumpBackForwardList();
>+   testRunner.waitUntilDone();
> }
> 
> function loaded()
>Index: LayoutTests/fast/loader/early-load-cancel.html
>===================================================================
>--- LayoutTests/fast/loader/early-load-cancel.html	(revision 122551)
>+++ LayoutTests/fast/loader/early-load-cancel.html	(working copy)
>@@ -7,6 +7,6 @@ starting). If this test does not crash o
> bug is fixed.</p>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
>Index: LayoutTests/fast/loader/empty-embed-src-attribute.html
>===================================================================
>--- LayoutTests/fast/loader/empty-embed-src-attribute.html	(revision 122551)
>+++ LayoutTests/fast/loader/empty-embed-src-attribute.html	(working copy)
>@@ -1,8 +1,8 @@
> <html>
>     <head>
>         <script>
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
>         </script>
>     </head>
>     <body>
>Index: LayoutTests/fast/loader/empty-ref-versus-no-ref.html
>===================================================================
>--- LayoutTests/fast/loader/empty-ref-versus-no-ref.html	(revision 122551)
>+++ LayoutTests/fast/loader/empty-ref-versus-no-ref.html	(working copy)
>@@ -2,8 +2,8 @@
> <head>
> <script>
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function runTest() {
>     window.location.hash = '#foobarbaz';
>Index: LayoutTests/fast/loader/external-script-URL-location.html
>===================================================================
>--- LayoutTests/fast/loader/external-script-URL-location.html	(revision 122551)
>+++ LayoutTests/fast/loader/external-script-URL-location.html	(working copy)
>@@ -1,8 +1,8 @@
> <body onload="test()">
> FAILURE
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> function test()
> {
>     document.write("<br>Test 1<br>File in URL: " + leafName(document.URL) + "<br><script src='resources/external-script-URL-location.js'></scr" + "ipt>");
>Index: LayoutTests/fast/loader/file-URL-with-port-number.html
>===================================================================
>--- LayoutTests/fast/loader/file-URL-with-port-number.html	(revision 122551)
>+++ LayoutTests/fast/loader/file-URL-with-port-number.html	(working copy)
>@@ -3,15 +3,15 @@
> function subframeLoaded()
> {
>     document.getElementById("result").appendChild(document.createTextNode("SUCCESS: The subframe loaded."));
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> function runTest()
> {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
> 
>     var subframeLocation = window.location + "";
>Index: LayoutTests/fast/loader/file-protocol-fragment.html
>===================================================================
>--- LayoutTests/fast/loader/file-protocol-fragment.html	(revision 122551)
>+++ LayoutTests/fast/loader/file-protocol-fragment.html	(working copy)
>@@ -1,11 +1,11 @@
> <html>
> <head>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.dumpResourceLoadCallbacks();
>-        if (layoutTestController.setSerializeHTTPLoads)
>-            layoutTestController.setSerializeHTTPLoads();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.dumpResourceLoadCallbacks();
>+        if (testRunner.setSerializeHTTPLoads)
>+            testRunner.setSerializeHTTPLoads();
>     } else {
>         document.write ('This test must be run through DumpRenderTree.')
>     }
>Index: LayoutTests/fast/loader/font-face-empty.html
>===================================================================
>--- LayoutTests/fast/loader/font-face-empty.html	(revision 122551)
>+++ LayoutTests/fast/loader/font-face-empty.html	(working copy)
>@@ -5,8 +5,8 @@
>     }
> </style>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <p>This is a test for <a href="http://bugs.webkit.org/show_bug.cgi?id=16996">Bug 16996: Crash in
> createFontCustomPlatformData when loading 0-byte font via @font-face</a>.</p>
>Index: LayoutTests/fast/loader/for-window-event-onload-scripts.html
>===================================================================
>--- LayoutTests/fast/loader/for-window-event-onload-scripts.html	(revision 122551)
>+++ LayoutTests/fast/loader/for-window-event-onload-scripts.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> 
> <script for="body" event="onload()">
>Index: LayoutTests/fast/loader/form-events-back-forward.html-disabled
>===================================================================
>--- LayoutTests/fast/loader/form-events-back-forward.html-disabled	(revision 122551)
>+++ LayoutTests/fast/loader/form-events-back-forward.html-disabled	(working copy)
>@@ -3,9 +3,9 @@
>         <script>
>             function test()
>             {
>-                if (window.layoutTestController) {
>-                    layoutTestController.dumpAsText();
>-                    layoutTestController.waitUntilDone();
>+                if (window.testRunner) {
>+                    testRunner.dumpAsText();
>+                    testRunner.waitUntilDone();
>                 }
>                     
>                 if (window.navigationController)
>@@ -18,8 +18,8 @@
>                 e.initEvent("click", true, false);
>                 document.getElementById('button').dispatchEvent(e);
>                 
>-                if (window.layoutTestController)
>-                    layoutTestController.notifyDone();
>+                if (window.testRunner)
>+                    testRunner.notifyDone();
>             }
> 
>             function button_onClick()
>Index: LayoutTests/fast/loader/form-state-restore-with-locked-back-forward-list.html
>===================================================================
>--- LayoutTests/fast/loader/form-state-restore-with-locked-back-forward-list.html	(revision 122551)
>+++ LayoutTests/fast/loader/form-state-restore-with-locked-back-forward-list.html	(working copy)
>@@ -6,9 +6,9 @@
> <input name="TestName2" type="hidden" value="Bad2">
> </form>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> </script>
> </body>
>Index: LayoutTests/fast/loader/form-submission-after-beforeunload-cancel.html
>===================================================================
>--- LayoutTests/fast/loader/form-submission-after-beforeunload-cancel.html	(revision 122551)
>+++ LayoutTests/fast/loader/form-submission-after-beforeunload-cancel.html	(working copy)
>@@ -1,8 +1,8 @@
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.setShouldStayOnPageAfterHandlingBeforeUnload(true);
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
>+    testRunner.dumpAsText();
>+    testRunner.setShouldStayOnPageAfterHandlingBeforeUnload(true);
> }
> 
> _confirmationDialogDisplayedOnce = false;
>@@ -13,13 +13,13 @@ window.addEventListener("beforeunload", 
>         return "Click 'Leave Page'";
> 
>     window.setTimeout(function() {
>-        if (window.layoutTestController)
>-            layoutTestController.setShouldStayOnPageAfterHandlingBeforeUnload(false);
>+        if (window.testRunner)
>+            testRunner.setShouldStayOnPageAfterHandlingBeforeUnload(false);
> 
>         window.setTimeout(function() {
>             document.getElementById("console").innerHTML = "FAIL";
>-            if (window.layoutTestController)
>-                layoutTestController.notifyDone();
>+            if (window.testRunner)
>+                testRunner.notifyDone();
>         }, 1000);
> 
>         document.forms[0].submit();
>Index: LayoutTests/fast/loader/form-submission-before-load-get.html
>===================================================================
>--- LayoutTests/fast/loader/form-submission-before-load-get.html	(revision 122551)
>+++ LayoutTests/fast/loader/form-submission-before-load-get.html	(working copy)
>@@ -1,10 +1,10 @@
> <form method="get" action="resources/form-submission-before-load-page2.html"></form>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> // Test that submitting the form, using a GET method, before the 'load' event
> // results in the current session history item being replaced by the next one.
>Index: LayoutTests/fast/loader/form-submission-before-load-post.html
>===================================================================
>--- LayoutTests/fast/loader/form-submission-before-load-post.html	(revision 122551)
>+++ LayoutTests/fast/loader/form-submission-before-load-post.html	(working copy)
>@@ -1,10 +1,10 @@
> <form method="post" action="resources/form-submission-before-load-page2.html"></form>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> // Test that submitting the form, using a POST method, before the 'load' event
> // results in the current session history item being replaced by the next one.
>Index: LayoutTests/fast/loader/form-submit-aborts-parsing.html
>===================================================================
>--- LayoutTests/fast/loader/form-submit-aborts-parsing.html	(revision 122551)
>+++ LayoutTests/fast/loader/form-submit-aborts-parsing.html	(working copy)
>@@ -1,8 +1,8 @@
> <form method="POST" action="resources/location-change-aborts-parsing-pass.html"></form>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> document.forms[0].submit();
> </script>
>Index: LayoutTests/fast/loader/fragment-after-redirect-gets-back-entry.html
>===================================================================
>--- LayoutTests/fast/loader/fragment-after-redirect-gets-back-entry.html	(revision 122551)
>+++ LayoutTests/fast/loader/fragment-after-redirect-gets-back-entry.html	(working copy)
>@@ -1,9 +1,9 @@
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpBackForwardList();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpBackForwardList();
>+    testRunner.waitUntilDone();
> }
> 
> window.location.replace('resources/click-fragment-link.html');
>Index: LayoutTests/fast/loader/frame-creation-removal.html
>===================================================================
>--- LayoutTests/fast/loader/frame-creation-removal.html	(revision 122551)
>+++ LayoutTests/fast/loader/frame-creation-removal.html	(working copy)
>@@ -2,8 +2,8 @@
> <head>
> <script>
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function loaded()
> {
>Index: LayoutTests/fast/loader/frame-location-change-not-added-to-history.html
>===================================================================
>--- LayoutTests/fast/loader/frame-location-change-not-added-to-history.html	(revision 122551)
>+++ LayoutTests/fast/loader/frame-location-change-not-added-to-history.html	(working copy)
>@@ -11,8 +11,8 @@ function runTest() {
> 
>   f.onload = function() {
>     document.body.innerText = "history.length = " + history.length;
>-    if (window.layoutTestController)
>-      layoutTestController.notifyDone();
>+    if (window.testRunner)
>+      testRunner.notifyDone();
>   }
> }
> 
>@@ -21,11 +21,11 @@ onunload = function() {
> }
> 
> onload = function() {
>-  if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpBackForwardList();
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.waitUntilDone();
>+  if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpBackForwardList();
>+    testRunner.clearBackForwardList();
>+    testRunner.waitUntilDone();
>   }
>   setTimeout(runTest, 0);
> }
>Index: LayoutTests/fast/loader/frame-src-change-added-to-history.html
>===================================================================
>--- LayoutTests/fast/loader/frame-src-change-added-to-history.html	(revision 122551)
>+++ LayoutTests/fast/loader/frame-src-change-added-to-history.html	(working copy)
>@@ -2,19 +2,19 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.dumpChildFramesAsText();
>-  layoutTestController.dumpBackForwardList();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.dumpChildFramesAsText();
>+  testRunner.dumpBackForwardList();
>+  testRunner.waitUntilDone();
> }
> 
> var count = 4;
> 
> function frameLoaded() {
>   if (count == 0) {
>-    if (window.layoutTestController)
>-      layoutTestController.notifyDone();
>+    if (window.testRunner)
>+      testRunner.notifyDone();
>   } else {
>     document.getElementsByTagName('iframe')[0].src = "data:," + count--;
>   }
>Index: LayoutTests/fast/loader/frame-src-change-not-added-to-history.html
>===================================================================
>--- LayoutTests/fast/loader/frame-src-change-not-added-to-history.html	(revision 122551)
>+++ LayoutTests/fast/loader/frame-src-change-not-added-to-history.html	(working copy)
>@@ -11,8 +11,8 @@ function runTest() {
> 
>   f.onload = function() {
>     document.body.innerText = "history.length = " + history.length;
>-    if (window.layoutTestController)
>-      layoutTestController.notifyDone();
>+    if (window.testRunner)
>+      testRunner.notifyDone();
>   }
> }
> 
>@@ -21,11 +21,11 @@ onunload = function() {
> }
> 
> onload = function() {
>-  if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpBackForwardList();
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.waitUntilDone();
>+  if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpBackForwardList();
>+    testRunner.clearBackForwardList();
>+    testRunner.waitUntilDone();
>   }
>   setTimeout(runTest, 0);
> }
>Index: LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache.html
>===================================================================
>--- LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache.html	(revision 122551)
>+++ LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
>+    testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
> }
> 
> window.onload = function() {
>Index: LayoutTests/fast/loader/goto-anchor-infinite-layout.html
>===================================================================
>--- LayoutTests/fast/loader/goto-anchor-infinite-layout.html	(revision 122551)
>+++ LayoutTests/fast/loader/goto-anchor-infinite-layout.html	(working copy)
>@@ -15,8 +15,8 @@
>     This is the anchor.
> </div>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     document.write(location.href="#anchor");
> </script>
>Index: LayoutTests/fast/loader/grandparent-completion-starts-redirect.html
>===================================================================
>--- LayoutTests/fast/loader/grandparent-completion-starts-redirect.html	(revision 122551)
>+++ LayoutTests/fast/loader/grandparent-completion-starts-redirect.html	(working copy)
>@@ -1,10 +1,10 @@
> <html>
> <head>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpChildFramesAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpChildFramesAsText();
>+    testRunner.waitUntilDone();
> }
> </script>
> </head>
>Index: LayoutTests/fast/loader/hashchange-event-async.html
>===================================================================
>--- LayoutTests/fast/loader/hashchange-event-async.html	(revision 122551)
>+++ LayoutTests/fast/loader/hashchange-event-async.html	(working copy)
>@@ -14,7 +14,7 @@ var hashChanging = false;
> var failed = false;
> var msgs = [];
> 
>-var lc = window.layoutTestController;
>+var lc = window.testRunner;
> if (lc) {
>     lc.dumpAsText();
>     lc.waitUntilDone();
>Index: LayoutTests/fast/loader/hashchange-event.html
>===================================================================
>--- LayoutTests/fast/loader/hashchange-event.html	(revision 122551)
>+++ LayoutTests/fast/loader/hashchange-event.html	(working copy)
>@@ -17,9 +17,9 @@ if (sessionStorage.totalEventsFired == t
> sessionStorage.clear();
> sessionStorage.totalEventsFired = 0;
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function startTest()
>@@ -54,8 +54,8 @@ function hashChanged(eventHandlerName)
>         location.hash="";
>         location.href=location.href.substr(0, location.href.length - 1);
>     }
>-    if (testNumber == 2 && sessionStorage.totalEventsFired == targetNumberOfEventsForSecondTest && window.layoutTestController) {
>-        layoutTestController.notifyDone();
>+    if (testNumber == 2 && sessionStorage.totalEventsFired == targetNumberOfEventsForSecondTest && window.testRunner) {
>+        testRunner.notifyDone();
>         sessionStorage.clear();
>     }
> }
>Index: LayoutTests/fast/loader/history-forward-in-head.html
>===================================================================
>--- LayoutTests/fast/loader/history-forward-in-head.html	(revision 122551)
>+++ LayoutTests/fast/loader/history-forward-in-head.html	(working copy)
>@@ -1,8 +1,8 @@
> <html>
> <head>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
>     
> history.forward();
> </script>
>Index: LayoutTests/fast/loader/iframe-recursive-synchronous-load.html
>===================================================================
>--- LayoutTests/fast/loader/iframe-recursive-synchronous-load.html	(revision 122551)
>+++ LayoutTests/fast/loader/iframe-recursive-synchronous-load.html	(working copy)
>@@ -5,8 +5,8 @@ from another iframe's onload handler.
> <p>PASS: You didn't crash.</p>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function addFrame()
> {
>Index: LayoutTests/fast/loader/image-in-page-cache.html
>===================================================================
>--- LayoutTests/fast/loader/image-in-page-cache.html	(revision 122551)
>+++ LayoutTests/fast/loader/image-in-page-cache.html	(working copy)
>@@ -6,11 +6,11 @@
> <script>
> var otherWindow;
> function runTest() {
>-	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);
> 	}
> 
> 	// This test open two windows. One primary window will load animated-image.html.
>Index: LayoutTests/fast/loader/inherit-charset-to-empty-frame.html
>===================================================================
>--- LayoutTests/fast/loader/inherit-charset-to-empty-frame.html	(revision 122551)
>+++ LayoutTests/fast/loader/inherit-charset-to-empty-frame.html	(working copy)
>@@ -6,8 +6,8 @@
> <p>Test that a programmatically created empty iframe inherits charset from the parent.
> <p id=result>
> <script type="text/javascript">
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function createEmptyIframe() {
>    if (!document.getElementById('containerName')) {
>Index: LayoutTests/fast/loader/input-element-page-cache-crash.html
>===================================================================
>--- LayoutTests/fast/loader/input-element-page-cache-crash.html	(revision 122551)
>+++ LayoutTests/fast/loader/input-element-page-cache-crash.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
>+    testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
> }
> 
> function runTest()
>@@ -33,8 +33,8 @@ function pageShown()
> {
>     if (sessionStorage.finishTest) {
>         console.log('navigated back');
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     } else {
>         runTest();
>     }
>Index: LayoutTests/fast/loader/javascript-url-encoding-2.html
>===================================================================
>--- LayoutTests/fast/loader/javascript-url-encoding-2.html	(revision 122551)
>+++ LayoutTests/fast/loader/javascript-url-encoding-2.html	(working copy)
>@@ -3,11 +3,11 @@
> <script>
> function test()
> {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
>-    window.location.href="javascript:'<p foo=\"?\">Should be Cyrillic text, not U+FFFD REPLACEMENT CHARACTERS: Ïðîâåðêà</p><script>if (window.layoutTestController) layoutTestController.notifyDone()</scr" + "ipt>'";
>+    window.location.href="javascript:'<p foo=\"?\">Should be Cyrillic text, not U+FFFD REPLACEMENT CHARACTERS: Ïðîâåðêà</p><script>if (window.testRunner) testRunner.notifyDone()</scr" + "ipt>'";
> }
> </script>
> </head>
>Index: LayoutTests/fast/loader/javascript-url-encoding.html
>===================================================================
>--- LayoutTests/fast/loader/javascript-url-encoding.html	(revision 122551)
>+++ LayoutTests/fast/loader/javascript-url-encoding.html	(working copy)
>@@ -1,8 +1,8 @@
> <meta charset="windows-1251">
> <body onload="test()">
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function test() {
>     document.getElementById("result").innerHTML = "1. " + (window.frames[0].document.body.innerHTML == "SUÑÑÅSS" ? "SUCCESS" : "FAILURE: " + window.frames[0].document.body.innerHTML) + ".\r";
>Index: LayoutTests/fast/loader/javascript-url-hierarchical-execution.html
>===================================================================
>--- LayoutTests/fast/loader/javascript-url-hierarchical-execution.html	(revision 122551)
>+++ LayoutTests/fast/loader/javascript-url-hierarchical-execution.html	(working copy)
>@@ -1,8 +1,8 @@
> <html>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.setCustomPolicyDelegate(true, true);
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.setCustomPolicyDelegate(true, true);
> }
> 
> function runTest()
>Index: LayoutTests/fast/loader/javascript-url-iframe-crash.html
>===================================================================
>--- LayoutTests/fast/loader/javascript-url-iframe-crash.html	(revision 122551)
>+++ LayoutTests/fast/loader/javascript-url-iframe-crash.html	(working copy)
>@@ -3,7 +3,7 @@
> 
> <a>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> This test passes if it doesn't crash.
>Index: LayoutTests/fast/loader/javascript-url-iframe-remove-on-navigate.html
>===================================================================
>--- LayoutTests/fast/loader/javascript-url-iframe-remove-on-navigate.html	(revision 122551)
>+++ LayoutTests/fast/loader/javascript-url-iframe-remove-on-navigate.html	(working copy)
>@@ -1,8 +1,8 @@
> <iframe src="http://does.not.exist/" id="target"></iframe>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> setTimeout(function() {
>@@ -11,7 +11,7 @@ setTimeout(function() {
> 
> window.addEventListener("popstate", function() {
>         document.write("PASS - Javascript URL blocked without crashing.");
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }, false);
> </script>
>Index: LayoutTests/fast/loader/javascript-url-in-embed.html
>===================================================================
>--- LayoutTests/fast/loader/javascript-url-in-embed.html	(revision 122551)
>+++ LayoutTests/fast/loader/javascript-url-in-embed.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <p>This tests that javascript: urls in an embed tag do not get executed.</p>
> <embed src="javascript:alert('FAIL - javascript: url url was executed.');"></embed> 
>Index: LayoutTests/fast/loader/javascript-url-in-object.html
>===================================================================
>--- LayoutTests/fast/loader/javascript-url-in-object.html	(revision 122551)
>+++ LayoutTests/fast/loader/javascript-url-in-object.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <p>This tests that javascript: urls in an object tag do not get executed.</p>
> <object data="javascript:alert('FAIL - javascript: url was executed.');"></object> 
>Index: LayoutTests/fast/loader/link-no-URL.html
>===================================================================
>--- LayoutTests/fast/loader/link-no-URL.html	(revision 122551)
>+++ LayoutTests/fast/loader/link-no-URL.html	(working copy)
>@@ -2,8 +2,8 @@
> <head>
> <link type="text/css">
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> </head>
> <body>
>Index: LayoutTests/fast/loader/loadInProgress.html
>===================================================================
>--- LayoutTests/fast/loader/loadInProgress.html	(revision 122551)
>+++ LayoutTests/fast/loader/loadInProgress.html	(working copy)
>@@ -2,8 +2,8 @@
>     <head>
>         <link rel="stylesheet" href="fake.css" type="text/css" >
>         <script>	
>-                if (window.layoutTestController) {
>-                    layoutTestController.dumpAsText();
>+                if (window.testRunner) {
>+                    testRunner.dumpAsText();
>                 }
>                 function testForm() {
>                     if (document.LoginForm)
>Index: LayoutTests/fast/loader/local-CSS-from-local.html
>===================================================================
>--- LayoutTests/fast/loader/local-CSS-from-local.html	(revision 122551)
>+++ LayoutTests/fast/loader/local-CSS-from-local.html	(working copy)
>@@ -2,14 +2,14 @@
> <head>
>     <script>
>         function test() {
>-            if (window.layoutTestController) {
>-                layoutTestController.dumpAsText();
>-                layoutTestController.waitUntilDone();
>+            if (window.testRunner) {
>+                testRunner.dumpAsText();
>+                testRunner.waitUntilDone();
>             }
> 
>             var localStyleSheetLocation = "file:///tmp/LayoutTests/http/tests/security/resources/cssStyle.css";
>-            if (window.layoutTestController)
>-                localStyleSheetLocation = layoutTestController.pathToLocalResource(localStyleSheetLocation);
>+            if (window.testRunner)
>+                localStyleSheetLocation = testRunner.pathToLocalResource(localStyleSheetLocation);
> 
>             var localLinkElement = document.createElement("link");
>             localLinkElement.setAttribute("type", "text/css");
>@@ -21,8 +21,8 @@
>             // Unfortunately link tags do not have load events, so we cannot simply make a load handler.
>             window.setTimeout(backgroundCheck, 1);
>             window.setTimeout(function() {
>-                if (window.layoutTestController)
>-                    layoutTestController.notifyDone();
>+                if (window.testRunner)
>+                    testRunner.notifyDone();
>             }, 5000);
>         }
> 
>@@ -33,8 +33,8 @@
>             var bgColor = style.getPropertyValue("background-color");
>             if (bgColor[4] == 2) {
>                 result.innerHTML = "Test Passed. Local CSS remotely loaded";
>-                if (window.layoutTestController)
>-                    layoutTestController.notifyDone();
>+                if (window.testRunner)
>+                    testRunner.notifyDone();
>             } else {
>                 result.innerHTML = "Test Failed: Local CSS not remotely loaded.";
>                 window.setTimeout(backgroundCheck, 1);
>Index: LayoutTests/fast/loader/local-JavaScript-from-local.html
>===================================================================
>--- LayoutTests/fast/loader/local-JavaScript-from-local.html	(revision 122551)
>+++ LayoutTests/fast/loader/local-JavaScript-from-local.html	(working copy)
>@@ -4,14 +4,14 @@
>     var secretness = 0;
> 
>     function test() {
>-        if (window.layoutTestController) {
>-            layoutTestController.dumpAsText();
>-            layoutTestController.waitUntilDone();
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>+            testRunner.waitUntilDone();
>         }
> 
>         var localScriptLocation = "file:///tmp/LayoutTests/http/tests/security/resources/localScript.js";
>-        if (window.layoutTestController)
>-            localScriptLocation = layoutTestController.pathToLocalResource(localScriptLocation);
>+        if (window.testRunner)
>+            localScriptLocation = testRunner.pathToLocalResource(localScriptLocation);
> 
>         var localScriptElement = document.createElement("script");
>         localScriptElement.setAttribute("src", localScriptLocation);
>@@ -22,15 +22,15 @@
>             else
>                 tag.innerHTML = "Test Failed. Local script loaded, but not successfully run.";
> 
>-            if (window.layoutTestController)
>-                layoutTestController.notifyDone();
>+            if (window.testRunner)
>+                testRunner.notifyDone();
>         });
>         localScriptElement.addEventListener("error", function() {
>             var tag = document.getElementById("result");
>             tag.innerHTML = "Test Failed: Local script not loaded.";
> 
>-            if (window.layoutTestController)
>-                layoutTestController.notifyDone();
>+            if (window.testRunner)
>+                testRunner.notifyDone();
>         });
> 
>         document.body.appendChild(localScriptElement)
>Index: LayoutTests/fast/loader/local-css-allowed-in-strict-mode.html
>===================================================================
>--- LayoutTests/fast/loader/local-css-allowed-in-strict-mode.html	(revision 122551)
>+++ LayoutTests/fast/loader/local-css-allowed-in-strict-mode.html	(working copy)
>@@ -6,8 +6,8 @@
>     <script>
>         function test()
>         {
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
>             
>             var target = document.getElementById("target");
>             var style = getComputedStyle(target);
>Index: LayoutTests/fast/loader/local-iFrame-source-from-local.html
>===================================================================
>--- LayoutTests/fast/loader/local-iFrame-source-from-local.html	(revision 122551)
>+++ LayoutTests/fast/loader/local-iFrame-source-from-local.html	(working copy)
>@@ -2,12 +2,12 @@
> <head>
>     <script>
>         function iFrameTest() {
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
> 
>             var localPageLocation = "file:///tmp/LayoutTests/http/tests/security/resources/localPage.html";
>-            if (window.layoutTestController)
>-                localPageLocation = layoutTestController.pathToLocalResource(localPageLocation);
>+            if (window.testRunner)
>+                localPageLocation = testRunner.pathToLocalResource(localPageLocation);
> 
>             var localIframeElement = document.createElement("iFrame");
>             localIframeElement.setAttribute("id", "myFrame");
>Index: LayoutTests/fast/loader/local-image-from-local.html
>===================================================================
>--- LayoutTests/fast/loader/local-image-from-local.html	(revision 122551)
>+++ LayoutTests/fast/loader/local-image-from-local.html	(working copy)
>@@ -1,12 +1,12 @@
> <html>
> <head>
>     <script>        
>-        if (window.layoutTestController)
>-            layoutTestController.dumpAsText();
>+        if (window.testRunner)
>+            testRunner.dumpAsText();
> 
>         var localImageLocation = "file:///tmp/LayoutTests/http/tests/security/resources/compass.jpg";
>-        if (window.layoutTestController)
>-            localImageLocation = layoutTestController.pathToLocalResource(localImageLocation);
>+        if (window.testRunner)
>+            localImageLocation = testRunner.pathToLocalResource(localImageLocation);
> 
>         var localImageElement = document.createElement("img");
>         localImageElement.setAttribute("id", "myImg");
>Index: LayoutTests/fast/loader/local-svg-parsed-as-svg.svg
>===================================================================
>--- LayoutTests/fast/loader/local-svg-parsed-as-svg.svg	(revision 122551)
>+++ LayoutTests/fast/loader/local-svg-parsed-as-svg.svg	(working copy)
>@@ -1,7 +1,7 @@
> <svg xmlns="http://www.w3.org/2000/svg">
>     <script>
>-        if (window.layoutTestController)
>-           layoutTestController.dumpAsText();
>+        if (window.testRunner)
>+           testRunner.dumpAsText();
>         var tagName = document.documentElement.tagName;
>         alert(tagName == "svg" ? "PASS: File parsed as SVG" : "FAIL: document.documentElement.tagName was '" + tagName + "', expected 'svg'");
>     </script>
>Index: LayoutTests/fast/loader/local-xhtml-parsed-as-xhtml.xhtml
>===================================================================
>--- LayoutTests/fast/loader/local-xhtml-parsed-as-xhtml.xhtml	(revision 122551)
>+++ LayoutTests/fast/loader/local-xhtml-parsed-as-xhtml.xhtml	(working copy)
>@@ -8,8 +8,8 @@
> 
>         window.onload = function()
>         {
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
>             var tagName = document.createElement('html').tagName;
>             log(tagName == "html" ? "PASS: File parsed as XHTML" : "FAIL: document.createElement('html').tagName was '" + tagName + "', expected 'html'");
>         }
>Index: LayoutTests/fast/loader/location-change-aborts-parsing.html
>===================================================================
>--- LayoutTests/fast/loader/location-change-aborts-parsing.html	(revision 122551)
>+++ LayoutTests/fast/loader/location-change-aborts-parsing.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> window.location.href = 'resources/location-change-aborts-parsing-pass.html';
> </script>
>Index: LayoutTests/fast/loader/location-port.html
>===================================================================
>--- LayoutTests/fast/loader/location-port.html	(revision 122551)
>+++ LayoutTests/fast/loader/location-port.html	(working copy)
>@@ -51,16 +51,16 @@
>         var internalFrame = document.getElementById ('internal');
>         shouldBe('internalFrame.contentWindow.location.host', ':0');
> 
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }
> 
> 
>     function runTests() {
>-        if (window.layoutTestController) {
>-            layoutTestController.clearBackForwardList();
>-            layoutTestController.dumpAsText();
>-            layoutTestController.waitUntilDone();
>+        if (window.testRunner) {
>+            testRunner.clearBackForwardList();
>+            testRunner.dumpAsText();
>+            testRunner.waitUntilDone();
>         }
> 
>         var internalFrame = document.getElementById ('internal');
>Index: LayoutTests/fast/loader/main-document-url-for-non-http-loads.html
>===================================================================
>--- LayoutTests/fast/loader/main-document-url-for-non-http-loads.html	(revision 122551)
>+++ LayoutTests/fast/loader/main-document-url-for-non-http-loads.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpResourceLoadCallbacks();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpResourceLoadCallbacks();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> </script>
>Index: LayoutTests/fast/loader/meta-refresh-vs-open.html
>===================================================================
>--- LayoutTests/fast/loader/meta-refresh-vs-open.html	(revision 122551)
>+++ LayoutTests/fast/loader/meta-refresh-vs-open.html	(working copy)
>@@ -1,9 +1,9 @@
> <html>
> <head>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> </script>
> <meta http-equiv="refresh" content="0;url=data:text/plain,You should not have been redirected here.">
>@@ -12,7 +12,7 @@ if (window.layoutTestController) {
> <iframe id="ifrm" src="about:blank"></iframe>
> <script>
>     document.body.onload = function() {
>-        if (window.layoutTestController)
>+        if (window.testRunner)
>             document.write('<p>FAIL: onload</p>');
>         else
>             alert('FAIL: onload');
>@@ -27,8 +27,8 @@ if (window.layoutTestController) {
>         if (window.stop)
>             stop();
>         document.getElementById("ifrm").contentDocument.close();
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>       }, 500);
> </script>
> <p>SUCCESS - shouldn't refresh or invoke onload.</p>
>Index: LayoutTests/fast/loader/non-deferred-substitute-load.html
>===================================================================
>--- LayoutTests/fast/loader/non-deferred-substitute-load.html	(revision 122551)
>+++ LayoutTests/fast/loader/non-deferred-substitute-load.html	(working copy)
>@@ -1,10 +1,10 @@
> <p>This tests that using substitute load in combination with non-deferred main resource loading will not cause
> assertions or duplicate loads, which can happen if the substitute document contains JavaScript-alerts.</p>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.setDeferMainResourceDataLoad(false);
>-    layoutTestController.queueLoadHTMLString("<script>if (typeof(hasBeenLoaded) != 'undefined') {" +
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.setDeferMainResourceDataLoad(false);
>+    testRunner.queueLoadHTMLString("<script>if (typeof(hasBeenLoaded) != 'undefined') {" +
>         "document.getElementById('result').innerHTML = 'FAILURE';" +
>     "} else { " +
>         "hasBeenLoaded = true; document.write('<div id=result>PASS</div>'); alert('Triggering bug through JS-alert'); }" +
>Index: LayoutTests/fast/loader/null-request-after-willSendRequest.html
>===================================================================
>--- LayoutTests/fast/loader/null-request-after-willSendRequest.html	(revision 122551)
>+++ LayoutTests/fast/loader/null-request-after-willSendRequest.html	(working copy)
>@@ -7,6 +7,6 @@
> </p>
> <img src="http://10.0.0.1/">
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
>Index: LayoutTests/fast/loader/onhashchange-attribute-listeners.html
>===================================================================
>--- LayoutTests/fast/loader/onhashchange-attribute-listeners.html	(revision 122551)
>+++ LayoutTests/fast/loader/onhashchange-attribute-listeners.html	(working copy)
>@@ -2,9 +2,9 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function startTest() {
>@@ -39,8 +39,8 @@ function bodyAssignedAttribute()
> function windowAttribute()
> {
>     alert("window.onhashchange attribute called.");
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/fast/loader/onload-bad-scheme-for-frame.html
>===================================================================
>--- LayoutTests/fast/loader/onload-bad-scheme-for-frame.html	(revision 122551)
>+++ LayoutTests/fast/loader/onload-bad-scheme-for-frame.html	(working copy)
>@@ -3,12 +3,12 @@
> <head>
>     <title>Test for Bug 33533: window.onload never fires if page contains an &lt;iframe> with a bad scheme or whose load is cancelled by returning null from resource load delegate's willSendRequest</title>
>     <script>
>-        if (window.layoutTestController)
>-            layoutTestController.dumpAsText();
>+        if (window.testRunner)
>+            testRunner.dumpAsText();
> 
>         window.onload = function() {
>             var result = document.getElementById("result");
>-            if (!window.layoutTestController) {
>+            if (!window.testRunner) {
>                 result.innerText = "This test can only be run in DumpRenderTree.";
>                 return;
>             }
>Index: LayoutTests/fast/loader/onload-policy-ignore-for-frame.html
>===================================================================
>--- LayoutTests/fast/loader/onload-policy-ignore-for-frame.html	(revision 122551)
>+++ LayoutTests/fast/loader/onload-policy-ignore-for-frame.html	(working copy)
>@@ -3,14 +3,14 @@
> <head>
>     <title>Test for Bug 33533: window.onload never fires if page contains an &lt;iframe> with a bad scheme or whose load is cancelled by returning null from resource load delegate's willSendRequest</title>
>     <script>
>-        if (window.layoutTestController) {
>-            layoutTestController.dumpAsText();
>-            layoutTestController.setCustomPolicyDelegate(true);
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>+            testRunner.setCustomPolicyDelegate(true);
>         }
> 
>         window.onload = function() {
>             var result = document.getElementById("result");
>-            if (!window.layoutTestController) {
>+            if (!window.testRunner) {
>                 result.innerText = "This test can only be run in DumpRenderTree.";
>                 return;
>             }
>Index: LayoutTests/fast/loader/onload-willSendRequest-null-for-frame.html
>===================================================================
>--- LayoutTests/fast/loader/onload-willSendRequest-null-for-frame.html	(revision 122551)
>+++ LayoutTests/fast/loader/onload-willSendRequest-null-for-frame.html	(working copy)
>@@ -3,14 +3,14 @@
> <head>
>     <title>Test for Bug 33533: window.onload never fires if page contains an &lt;iframe> with a bad scheme or whose load is cancelled by returning null from resource load delegate's willSendRequest</title>
>     <script>
>-        if (window.layoutTestController) {
>-            layoutTestController.dumpAsText();
>-            layoutTestController.setWillSendRequestReturnsNull(true);
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>+            testRunner.setWillSendRequestReturnsNull(true);
>         }
> 
>         window.onload = function() {
>             var result = document.getElementById("result");
>-            if (!window.layoutTestController) {
>+            if (!window.testRunner) {
>                 result.innerText = "This test can only be run in DumpRenderTree.";
>                 return;
>             }
>Index: LayoutTests/fast/loader/onload-willSendRequest-null-for-script.html
>===================================================================
>--- LayoutTests/fast/loader/onload-willSendRequest-null-for-script.html	(revision 122551)
>+++ LayoutTests/fast/loader/onload-willSendRequest-null-for-script.html	(working copy)
>@@ -4,14 +4,14 @@
>     <title>Test for Bug 33687: window.onload never fires if page contains a &lt;script src=foo>
>     whose load is cancelled by resource load delegate returning null from willSendRequest</title>
>     <script>
>-        if (window.layoutTestController) {
>-            layoutTestController.dumpAsText();
>-            layoutTestController.setWillSendRequestReturnsNull(true);
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>+            testRunner.setWillSendRequestReturnsNull(true);
>         }
> 
>         window.onload = function() {
>             var result = document.getElementById("result");
>-            if (!window.layoutTestController) {
>+            if (!window.testRunner) {
>                 result.innerText = "This test can only be run in DumpRenderTree.";
>                 return;
>             }
>Index: LayoutTests/fast/loader/onunload-form-submit-crash-2.html
>===================================================================
>--- LayoutTests/fast/loader/onunload-form-submit-crash-2.html	(revision 122551)
>+++ LayoutTests/fast/loader/onunload-form-submit-crash-2.html	(working copy)
>@@ -5,15 +5,15 @@
>         function test()
>         {
>             if (location.href.indexOf("?") == -1) {
>-                if (window.layoutTestController) {
>-                    layoutTestController.dumpAsText();
>-                    layoutTestController.waitUntilDone();
>+                if (window.testRunner) {
>+                    testRunner.dumpAsText();
>+                    testRunner.waitUntilDone();
>                 }
>                 location.href = "resources/onunload-form-submit-success.html";
>             } else {
>                 document.getElementById("result").innerText = "FAIL";
>-                if (window.layoutTestController)
>-                    layoutTestController.notifyDone();
>+                if (window.testRunner)
>+                    testRunner.notifyDone();
>             }
>         }
> 
>Index: LayoutTests/fast/loader/onunload-form-submit-crash.html
>===================================================================
>--- LayoutTests/fast/loader/onunload-form-submit-crash.html	(revision 122551)
>+++ LayoutTests/fast/loader/onunload-form-submit-crash.html	(working copy)
>@@ -1,9 +1,9 @@
> <html>
>     <body onUnload="document.myForm.submit()">
>         <script>
>-            if (window.layoutTestController) {
>-                layoutTestController.dumpAsText();
>-                layoutTestController.waitUntilDone();
>+            if (window.testRunner) {
>+                testRunner.dumpAsText();
>+                testRunner.waitUntilDone();
>             }
> 
>             window.setTimeout("location.href='resources/onunload-form-submit-success.html'", 0);
>Index: LayoutTests/fast/loader/opaque-base-url.html
>===================================================================
>--- LayoutTests/fast/loader/opaque-base-url.html	(revision 122551)
>+++ LayoutTests/fast/loader/opaque-base-url.html	(working copy)
>@@ -1,8 +1,8 @@
> <p>Test how opaque base URLs work for fetching subresources.</p>
> 
> <script>
>-if (window.layoutTestController)
>-  layoutTestController.dumpAsText();
>+if (window.testRunner)
>+  testRunner.dumpAsText();
> </script>
> 
> <ol>
>Index: LayoutTests/fast/loader/page-dismissal-modal-dialogs.html
>===================================================================
>--- LayoutTests/fast/loader/page-dismissal-modal-dialogs.html	(revision 122551)
>+++ LayoutTests/fast/loader/page-dismissal-modal-dialogs.html	(working copy)
>@@ -21,9 +21,9 @@ function registerEvents(name, thisFrame,
> 
> addEventListener("load", function() {
>     registerEvents("mainFrame", window, frames[0]);
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
>     location = "resources/pass-and-notify-done.html";
> }, false);
>Index: LayoutTests/fast/loader/ping-error.html
>===================================================================
>--- LayoutTests/fast/loader/ping-error.html	(revision 122551)
>+++ LayoutTests/fast/loader/ping-error.html	(working copy)
>@@ -2,16 +2,16 @@
> <p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=46579">bug 46579</a>:
> Reproducible crash in appcache code when closing pgatour.com</p>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.setCanOpenWindows();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
>+    testRunner.setCanOpenWindows();
> }
> 
> function done()
> {
>-    if (window.layoutTestController) 
>-        setTimeout('layoutTestController.notifyDone()', 0);
>+    if (window.testRunner) 
>+        setTimeout('testRunner.notifyDone()', 0);
> }
> 
> window.open("resources/ping-error-window.html");
>Index: LayoutTests/fast/loader/plain-text-document.html
>===================================================================
>--- LayoutTests/fast/loader/plain-text-document.html	(revision 122551)
>+++ LayoutTests/fast/loader/plain-text-document.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.dumpChildFramesAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.dumpChildFramesAsText();
>     }
> </script>
> <iframe src="resources/plain-text-document.txt">
>Index: LayoutTests/fast/loader/policy-delegate-action-hit-test-zoomed.html
>===================================================================
>--- LayoutTests/fast/loader/policy-delegate-action-hit-test-zoomed.html	(revision 122551)
>+++ LayoutTests/fast/loader/policy-delegate-action-hit-test-zoomed.html	(working copy)
>@@ -10,8 +10,8 @@
>         document.getElementById("log").appendChild(document.createTextNode(message + '\n'));
>     }
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
> 
>         eventSender.zoomPageIn();
>         eventSender.zoomPageIn();
>@@ -22,7 +22,7 @@
>         var x = (link.offsetLeft + link.offsetWidth / 2) * zoomFactor;
>         var y = (link.offsetTop + link.offsetHeight / 2) * zoomFactor;
> 
>-        layoutTestController.setCustomPolicyDelegate(true, false);
>+        testRunner.setCustomPolicyDelegate(true, false);
> 
>         log("The policy delegate message should indicate that the originating node is the text child of an anchor element.");
> 
>Index: LayoutTests/fast/loader/recursive-before-unload-crash.html
>===================================================================
>--- LayoutTests/fast/loader/recursive-before-unload-crash.html	(revision 122551)
>+++ LayoutTests/fast/loader/recursive-before-unload-crash.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.dumpAsText();
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
>+    testRunner.dumpAsText();
> }
> 
> var haveAddedIFrame = false;
>@@ -26,8 +26,8 @@ function addiframe() {
>     frame.src = "http://localhost:1234/"
>     document.body.appendChild(frame);
>     haveAddedIFrame = true;
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> function runTest() {
>Index: LayoutTests/fast/loader/redirect-with-open-subframe-2.html
>===================================================================
>--- LayoutTests/fast/loader/redirect-with-open-subframe-2.html	(revision 122551)
>+++ LayoutTests/fast/loader/redirect-with-open-subframe-2.html	(working copy)
>@@ -1,12 +1,12 @@
> <html>
> <script>
> function test() {
>-    if (window.layoutTestController) {
>-        layoutTestController.waitUntilDone();
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.waitUntilDone();
>+        testRunner.dumpAsText();
>     }
>     document.open();
>-    var newDoc = "SUCCESS<script>if (window.layoutTestController) layoutTestController.notifyDone();</scr" + "ipt>";
>+    var newDoc = "SUCCESS<script>if (window.testRunner) testRunner.notifyDone();</scr" + "ipt>";
>     setTimeout("window.location='data:text/html," + newDoc + "'", 500);
> }
> </script>
>Index: LayoutTests/fast/loader/redirect-with-open-subframe.html
>===================================================================
>--- LayoutTests/fast/loader/redirect-with-open-subframe.html	(revision 122551)
>+++ LayoutTests/fast/loader/redirect-with-open-subframe.html	(working copy)
>@@ -3,11 +3,11 @@
> <iframe id="ifrm" src="about:blank"></iframe>
> <script>
>     document.getElementById("ifrm").contentDocument.open();
>-    if (window.layoutTestController) {
>-        layoutTestController.waitUntilDone();
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.waitUntilDone();
>+        testRunner.dumpAsText();
>     }
>-    var newDoc = "SUCCESS<script>if (window.layoutTestController) layoutTestController.notifyDone();</scr" + "ipt>";
>+    var newDoc = "SUCCESS<script>if (window.testRunner) testRunner.notifyDone();</scr" + "ipt>";
>     setTimeout("window.location='data:text/html," + newDoc + "'", 500);
> </script>
> <div>FAILURE: should redirect.</div>
>Index: LayoutTests/fast/loader/reload-policy-delegate.html
>===================================================================
>--- LayoutTests/fast/loader/reload-policy-delegate.html	(revision 122551)
>+++ LayoutTests/fast/loader/reload-policy-delegate.html	(working copy)
>@@ -3,9 +3,9 @@
> <script type="text/javascript">
> function startTest()
> {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.setCustomPolicyDelegate(true, true);
>-    layoutTestController.queueReload();
>+    testRunner.dumpAsText();
>+    testRunner.setCustomPolicyDelegate(true, true);
>+    testRunner.queueReload();
> }
> </script>
> </head>
>Index: LayoutTests/fast/loader/reload-zero-byte-plugin.html
>===================================================================
>--- LayoutTests/fast/loader/reload-zero-byte-plugin.html	(revision 122551)
>+++ LayoutTests/fast/loader/reload-zero-byte-plugin.html	(working copy)
>@@ -1,17 +1,17 @@
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.setCanOpenWindows(true);
>-    layoutTestController.setCloseRemainingWindowsWhenComplete(true);
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
>+    testRunner.setCanOpenWindows(true);
>+    testRunner.setCloseRemainingWindowsWhenComplete(true);
> }
> 
> var win = window.open('data:application/x-webkit-test-netscape,');
> setTimeout(function() {
>     win.location.reload();
>     setTimeout(function() {
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }, 100);
> }, 100);
> </script>
>Index: LayoutTests/fast/loader/repeat-same-document-navigation.html
>===================================================================
>--- LayoutTests/fast/loader/repeat-same-document-navigation.html	(revision 122551)
>+++ LayoutTests/fast/loader/repeat-same-document-navigation.html	(working copy)
>@@ -1,9 +1,9 @@
> <html>
> <head>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function clickLink() {
>@@ -21,7 +21,7 @@ function run() {
>     var line = document.createElement('div');
>     line.appendChild(document.createTextNode("Scroll position is " + scrollY + "px"));
>     document.getElementById('anchor').appendChild(line);
>-    layoutTestController.notifyDone();    
>+    testRunner.notifyDone();    
> }
> 
> </script>
>Index: LayoutTests/fast/loader/sandboxed-plugin-crash.html
>===================================================================
>--- LayoutTests/fast/loader/sandboxed-plugin-crash.html	(revision 122551)
>+++ LayoutTests/fast/loader/sandboxed-plugin-crash.html	(working copy)
>@@ -2,8 +2,8 @@
> <head>
> <script>
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> </script>
> </head>
>Index: LayoutTests/fast/loader/scroll-position-restored-on-back-non-cached.html
>===================================================================
>--- LayoutTests/fast/loader/scroll-position-restored-on-back-non-cached.html	(revision 122551)
>+++ LayoutTests/fast/loader/scroll-position-restored-on-back-non-cached.html	(working copy)
>@@ -5,9 +5,9 @@
> function navigate()
> {
>     if (location.hash == "") {
>-        if (window.layoutTestController) {
>-            layoutTestController.dumpAsText();
>-            layoutTestController.waitUntilDone();
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>+            testRunner.waitUntilDone();
>         }
> 
>         scrollTo(0,100);
>@@ -21,8 +21,8 @@ function navigate()
>         var result = document.getElementById("result");
>         if (scrollPosition == 100)
>             result.innerHTML = "Success! The scroll position was restored after navigation."
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }, 0);
> }
> 
>Index: LayoutTests/fast/loader/scroll-position-restored-on-back.html
>===================================================================
>--- LayoutTests/fast/loader/scroll-position-restored-on-back.html	(revision 122551)
>+++ LayoutTests/fast/loader/scroll-position-restored-on-back.html	(working copy)
>@@ -5,10 +5,10 @@
> function navigate()
> {
>     if (location.hash == "") {
>-        if (window.layoutTestController) {
>-            layoutTestController.dumpAsText();
>-            layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>-            layoutTestController.waitUntilDone();
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>+            testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>+            testRunner.waitUntilDone();
>         }
> 
>         scrollTo(0,100);
>@@ -22,8 +22,8 @@ function navigate()
>         var result = document.getElementById("result");
>         if (scrollPosition == 100)
>             result.innerHTML = "Success! The scroll position was restored after navigation."
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }, 0);
> }
> 
>Index: LayoutTests/fast/loader/simultaneous-reloads-assert.html
>===================================================================
>--- LayoutTests/fast/loader/simultaneous-reloads-assert.html	(revision 122551)
>+++ LayoutTests/fast/loader/simultaneous-reloads-assert.html	(working copy)
>@@ -2,9 +2,9 @@
> <head>
>     <title>Test for http://bugs.webkit.org/show_bug.cgi?id=12479</title>
>     <script>
>-        if (window.layoutTestController) {
>-            layoutTestController.waitUntilDone();
>-            layoutTestController.dumpAsText();
>+        if (window.testRunner) {
>+            testRunner.waitUntilDone();
>+            testRunner.dumpAsText();
>             alert("If you do not hit an assertion failure when running this test with a debug build and you get a SUCCESS message, then you pass the test.");
>         }
> 
>@@ -15,9 +15,9 @@
>                 reloaded = true;
>                 frames[0].location.reload();
>             } else {
>-                if (window.layoutTestController) {
>+                if (window.testRunner) {
>                     alert("SUCCESS");
>-                    layoutTestController.notifyDone();
>+                    testRunner.notifyDone();
>                 }
>             }
>         }
>Index: LayoutTests/fast/loader/start-load-in-unload.html
>===================================================================
>--- LayoutTests/fast/loader/start-load-in-unload.html	(revision 122551)
>+++ LayoutTests/fast/loader/start-load-in-unload.html	(working copy)
>@@ -3,7 +3,7 @@
> <img id="i" src="nosrc.jpg">
> This test verifies that starting a subresource load from an unload handler does not cause crashes or assertion failures.
> <script>
>-if (window.layoutTestController)
>-  layoutTestController.dumpAsText();
>+if (window.testRunner)
>+  testRunner.dumpAsText();
> </script>
> </body>
>Index: LayoutTests/fast/loader/stop-provisional-loads.html
>===================================================================
>--- LayoutTests/fast/loader/stop-provisional-loads.html	(revision 122551)
>+++ LayoutTests/fast/loader/stop-provisional-loads.html	(working copy)
>@@ -2,9 +2,9 @@
> <head>
> 
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.setStopProvisionalFrameLoads();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.setStopProvisionalFrameLoads();
> }
> </script>
> 
>Index: LayoutTests/fast/loader/subframe-navigate-during-main-frame-load-expected.txt
>===================================================================
>--- LayoutTests/fast/loader/subframe-navigate-during-main-frame-load-expected.txt	(revision 122551)
>+++ LayoutTests/fast/loader/subframe-navigate-during-main-frame-load-expected.txt	(working copy)
>@@ -6,5 +6,5 @@ The iframe navigation should *not* resul
> ============== Back Forward List ==============
>         (file test):fast/loader/subframe-navigate-during-main-frame-load.html  **nav target**
> curr->  (file test):fast/loader/resources/subframe-navigate-during-main-frame-load2.html  **nav target**
>-            data:text/html,<body onload="layoutTestController.notifyDone();"></body> (in frame "subframe")
>+            data:text/html,<body onload="testRunner.notifyDone();"></body> (in frame "subframe")
> ===============================================
>Index: LayoutTests/fast/loader/subframe-navigate-during-main-frame-load.html
>===================================================================
>--- LayoutTests/fast/loader/subframe-navigate-during-main-frame-load.html	(revision 122551)
>+++ LayoutTests/fast/loader/subframe-navigate-during-main-frame-load.html	(working copy)
>@@ -4,10 +4,10 @@
> 
> function runTest()
> {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.dumpBackForwardList();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.dumpBackForwardList();
>+        testRunner.waitUntilDone();
>     }
> 
>     // Location changes need to happen outside the onload handler to generate history entries.
>Index: LayoutTests/fast/loader/subframe-removes-itself.html
>===================================================================
>--- LayoutTests/fast/loader/subframe-removes-itself.html	(revision 122551)
>+++ LayoutTests/fast/loader/subframe-removes-itself.html	(working copy)
>@@ -1,8 +1,8 @@
> This tests a subframe that removes itself to make sure a delegate message to indicate the interrupted load fires.
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpFrameLoadCallbacks();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpFrameLoadCallbacks();
> }
> </script>
> <iframe src="resources/subframe-that-removes-itself.html"></iframe>
>Index: LayoutTests/fast/loader/subframe-self-close.html
>===================================================================
>--- LayoutTests/fast/loader/subframe-self-close.html	(revision 122551)
>+++ LayoutTests/fast/loader/subframe-self-close.html	(working copy)
>@@ -1,9 +1,9 @@
> <html>
> <head>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpChildFramesAsText();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpChildFramesAsText();
> }
> </script>
> </head>
>Index: LayoutTests/fast/loader/submit-form-while-parsing-1.xhtml
>===================================================================
>--- LayoutTests/fast/loader/submit-form-while-parsing-1.xhtml	(revision 122551)
>+++ LayoutTests/fast/loader/submit-form-while-parsing-1.xhtml	(working copy)
>@@ -5,9 +5,9 @@
> <form name="form" method="POST" action="resources/submit-form-while-parsing-success.html"/>
> <script type="text/javascript">
> <![CDATA[
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> document.forms.form.submit();
> ]]>
>Index: LayoutTests/fast/loader/submit-form-while-parsing-2.html
>===================================================================
>--- LayoutTests/fast/loader/submit-form-while-parsing-2.html	(revision 122551)
>+++ LayoutTests/fast/loader/submit-form-while-parsing-2.html	(working copy)
>@@ -5,9 +5,9 @@ var testIsStarted = false;
> 
> function startTest()
> {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
> 
>     testIsStarted = true;
>@@ -29,8 +29,8 @@ function frameLoaded()
> 
>     document.getElementById("message").firstChild.data = "PASSED: If we successfully got here without an assertion or crash, all is well.";
> 
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/fast/loader/subresource-load-failed-crash.html
>===================================================================
>--- LayoutTests/fast/loader/subresource-load-failed-crash.html	(revision 122551)
>+++ LayoutTests/fast/loader/subresource-load-failed-crash.html	(working copy)
>@@ -1,9 +1,9 @@
> <html>
> <body id='console'>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> var xhr = new XMLHttpRequest;
>@@ -13,7 +13,7 @@ function secondRequest()
>     {
>         if (xhr.readyState == xhr.DONE) {
>             document.getElementById('console').appendChild(document.createTextNode("PASS"));
>-            layoutTestController.notifyDone();
>+            testRunner.notifyDone();
>         }
>     }
>     xhr.open("GET", "", true);
>Index: LayoutTests/fast/loader/subresource-willSendRequest-null.html
>===================================================================
>--- LayoutTests/fast/loader/subresource-willSendRequest-null.html	(revision 122551)
>+++ LayoutTests/fast/loader/subresource-willSendRequest-null.html	(working copy)
>@@ -3,9 +3,9 @@
> https://bugs.webkit.org/show_bug.cgi?id=49693<br>
> Ensure loads that go through our scheduler and are cancelled by willSendRequest() don't cause us to crash.
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.setWillSendRequestReturnsNull(true);
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.setWillSendRequestReturnsNull(true);
>     }
>     var img = new Image(1, 1);
>     document.getElementsByTagName("body")[0].appendChild(img);
>Index: LayoutTests/fast/loader/unload-form-about-blank.html
>===================================================================
>--- LayoutTests/fast/loader/unload-form-about-blank.html	(revision 122551)
>+++ LayoutTests/fast/loader/unload-form-about-blank.html	(working copy)
>@@ -5,9 +5,9 @@ addEventListener("unload", function() {
> </script>
> <form id="fm" action="about:blank" method="POST"></form>
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> window.location = "resources/pass-and-notify-done.html";
> </script>
>Index: LayoutTests/fast/loader/unload-form-post-about-blank.html
>===================================================================
>--- LayoutTests/fast/loader/unload-form-post-about-blank.html	(revision 122551)
>+++ LayoutTests/fast/loader/unload-form-post-about-blank.html	(working copy)
>@@ -5,9 +5,9 @@ addEventListener("unload", function() {
> </script>
> <form id="fm" action="about:blank" method="POST"></form>
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> window.location = "resources/pass-and-notify-done.html";
> </script>
>Index: LayoutTests/fast/loader/unload-form-post.html
>===================================================================
>--- LayoutTests/fast/loader/unload-form-post.html	(revision 122551)
>+++ LayoutTests/fast/loader/unload-form-post.html	(working copy)
>@@ -5,9 +5,9 @@ addEventListener("unload", function() {
> </script>
> <form id="fm" action="resources/fail-and-notify-done.html" method="POST"></form>
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> window.location = "resources/pass-and-notify-done.html";
> </script>
>Index: LayoutTests/fast/loader/unload-form.html
>===================================================================
>--- LayoutTests/fast/loader/unload-form.html	(revision 122551)
>+++ LayoutTests/fast/loader/unload-form.html	(working copy)
>@@ -5,9 +5,9 @@ addEventListener("unload", function() {
> </script>
> <form id="fm" action="resources/fail-and-notify-done.html" method="GET"></form>
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> window.location = "resources/pass-and-notify-done.html";
> </script>
>Index: LayoutTests/fast/loader/unload-hyperlink-targeted.html
>===================================================================
>--- LayoutTests/fast/loader/unload-hyperlink-targeted.html	(revision 122551)
>+++ LayoutTests/fast/loader/unload-hyperlink-targeted.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> </script>
> <iframe src="resources/unload-hyperlink-targeted-subframe.html">
>Index: LayoutTests/fast/loader/unload-hyperlink.html
>===================================================================
>--- LayoutTests/fast/loader/unload-hyperlink.html	(revision 122551)
>+++ LayoutTests/fast/loader/unload-hyperlink.html	(working copy)
>@@ -10,9 +10,9 @@ addEventListener("unload", function() {
> </script>
> <a id="lk" href="resources/fail-and-notify-done.html">Link to failure.</a>
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> window.location = "resources/pass-and-notify-done.html";
> </script>
>Index: LayoutTests/fast/loader/unload-javascript-url.html
>===================================================================
>--- LayoutTests/fast/loader/unload-javascript-url.html	(revision 122551)
>+++ LayoutTests/fast/loader/unload-javascript-url.html	(working copy)
>@@ -4,9 +4,9 @@ addEventListener("unload", function() {
> }, false);
> </script>
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> window.location = "resources/pass-and-notify-done.html";
> </script>
>Index: LayoutTests/fast/loader/unload-reload.html
>===================================================================
>--- LayoutTests/fast/loader/unload-reload.html	(revision 122551)
>+++ LayoutTests/fast/loader/unload-reload.html	(working copy)
>@@ -4,9 +4,9 @@ addEventListener("unload", function() {
> }, false);
> </script>
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> window.location = "resources/pass-and-notify-done.html";
> </script>
>Index: LayoutTests/fast/loader/unload-window-location.html
>===================================================================
>--- LayoutTests/fast/loader/unload-window-location.html	(revision 122551)
>+++ LayoutTests/fast/loader/unload-window-location.html	(working copy)
>@@ -4,9 +4,9 @@ addEventListener("unload", function() {
> }, false);
> </script>
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> window.location = "resources/pass-and-notify-done.html";
> </script>
>Index: LayoutTests/fast/loader/unschedule-relayout-after-unload.html
>===================================================================
>--- LayoutTests/fast/loader/unschedule-relayout-after-unload.html	(revision 122551)
>+++ LayoutTests/fast/loader/unschedule-relayout-after-unload.html	(working copy)
>@@ -4,10 +4,10 @@
> </body>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
>+    testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
> }
> 
> window.onpageshow = function(evt) {
>Index: LayoutTests/fast/loader/url-data-replace-backslash.html
>===================================================================
>--- LayoutTests/fast/loader/url-data-replace-backslash.html	(revision 122551)
>+++ LayoutTests/fast/loader/url-data-replace-backslash.html	(working copy)
>@@ -3,8 +3,8 @@ var d5 = "fail";
> </script>
> <script type="text/javascript" src="data:text/javascript,d5%20%3D%20'five\u0027s'%3B"></script>
> <script>
>-if (window.layoutTestController)
>-  layoutTestController.dumpAsText();
>+if (window.testRunner)
>+  testRunner.dumpAsText();
> if (d5 == "five's") {
>   document.write("PASS");
> } else {
>Index: LayoutTests/fast/loader/url-parse-1.html
>===================================================================
>--- LayoutTests/fast/loader/url-parse-1.html	(revision 122551)
>+++ LayoutTests/fast/loader/url-parse-1.html	(working copy)
>@@ -27,8 +27,8 @@
>         <tbody id = "results"></tbody>
>     </table>
>     <script>
>-        if (window.layoutTestController)
>-            layoutTestController.dumpAsText();
>+        if (window.testRunner)
>+            testRunner.dumpAsText();
> 
>         function test(url)
>         {
>Index: LayoutTests/fast/loader/url-strip-cr-lf-tab.html
>===================================================================
>--- LayoutTests/fast/loader/url-strip-cr-lf-tab.html	(revision 122551)
>+++ LayoutTests/fast/loader/url-strip-cr-lf-tab.html	(working copy)
>@@ -3,9 +3,9 @@ Test for <a href="https://bugs.webkit.or
> XMLHttpRequest should strip CR/LF characters from the URL (not just XMLHttpRequest, really, and TAB is also stripped).
> 
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> if (document.URL.indexOf('?') == -1) {
>@@ -19,8 +19,8 @@ if (document.URL.indexOf('?') == -1) {
>         else
>                 document.write("<p>Failure</p>");
>         
>-        if (window.layoutTestController)
>-                layoutTestController.notifyDone();
>+        if (window.testRunner)
>+                testRunner.notifyDone();
> }
> </script>
> </body>
>Index: LayoutTests/fast/loader/user-style-sheet-resource-load-callbacks.html
>===================================================================
>--- LayoutTests/fast/loader/user-style-sheet-resource-load-callbacks.html	(revision 122551)
>+++ LayoutTests/fast/loader/user-style-sheet-resource-load-callbacks.html	(working copy)
>@@ -1,15 +1,15 @@
> <html>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpResourceLoadCallbacks();
>-    layoutTestController.setUserStyleSheetLocation("file:///tmp/LayoutTests/fast/loader/resources/user-style-sheet.css");
>-    layoutTestController.setUserStyleSheetEnabled(true);
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpResourceLoadCallbacks();
>+    testRunner.setUserStyleSheetLocation("file:///tmp/LayoutTests/fast/loader/resources/user-style-sheet.css");
>+    testRunner.setUserStyleSheetEnabled(true);
> } else {
>     document.write ('This test must be run through DumpRenderTree.')
> }
> </script>
>-<body onload = "if (window.layoutTestController) layoutTestController.setUserStyleSheetEnabled(false);">
>+<body onload = "if (window.testRunner) testRunner.setUserStyleSheetEnabled(false);">
>     This tests that no delegate methods are sent for the user style sheet. No stylesheet load messages should be dumped.
> </div>
> </html>
>\ No newline at end of file
>Index: LayoutTests/fast/loader/user-stylesheet-fast-path.html
>===================================================================
>--- LayoutTests/fast/loader/user-stylesheet-fast-path.html	(revision 122551)
>+++ LayoutTests/fast/loader/user-stylesheet-fast-path.html	(working copy)
>@@ -14,19 +14,19 @@
>         {result:false, size:"160px", url:"%50%30%10%00%20%40"}
>     ];
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.setUserStyleSheetEnabled(true);
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.setUserStyleSheetEnabled(true);
> 
>         for (var i = 0; i < testObjects.length; i++) {
>             var obj = testObjects[i];
>-            layoutTestController.setUserStyleSheetLocation(obj.url);
>+            testRunner.setUserStyleSheetLocation(obj.url);
> 
>             document.body.offsetTop;
>             var result = getComputedStyle(document.body).fontSize == obj.size;
>             document.write((result == obj.result ? "PASS" : "FAIL") + " " + obj.size + "<br>");
> 
>-            layoutTestController.setUserStyleSheetLocation("");
>+            testRunner.setUserStyleSheetLocation("");
>         }
>     } else
>         document.write("This test can only be run in DumpRenderTree.");
>Index: LayoutTests/fast/loader/willSendRequest-null-for-preload.html
>===================================================================
>--- LayoutTests/fast/loader/willSendRequest-null-for-preload.html	(revision 122551)
>+++ LayoutTests/fast/loader/willSendRequest-null-for-preload.html	(working copy)
>@@ -3,9 +3,9 @@
> <head>
>     <title>Bug 53123: Crashes loading pages when cancelling subresource loads through WebKit</title>
>     <script>
>-        if (window.layoutTestController) {
>-            layoutTestController.dumpAsText();
>-            layoutTestController.setWillSendRequestReturnsNull(true);
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>+            testRunner.setWillSendRequestReturnsNull(true);
>         }
>     </script>
>     <script type="text/javascript" src="resources/empty-script.js"></script>
>Index: LayoutTests/fast/loader/window-clearing.html
>===================================================================
>--- LayoutTests/fast/loader/window-clearing.html	(revision 122551)
>+++ LayoutTests/fast/loader/window-clearing.html	(working copy)
>@@ -2,9 +2,9 @@
> <head>
> <script>
> function test() {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
> 
>     // set up test variables -- they should be cleared
>Index: LayoutTests/fast/loader/window-properties-restored-from-page-cache.html
>===================================================================
>--- LayoutTests/fast/loader/window-properties-restored-from-page-cache.html	(revision 122551)
>+++ LayoutTests/fast/loader/window-properties-restored-from-page-cache.html	(working copy)
>@@ -1,8 +1,8 @@
> <script>
>-if (window.layoutTestController) {
>-	layoutTestController.dumpAsText();
>-	layoutTestController.waitUntilDone();
>-	layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>+if (window.testRunner) {
>+	testRunner.dumpAsText();
>+	testRunner.waitUntilDone();
>+	testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
> }
> 
> var cachedApplicationCache = window.applicationCache;
>@@ -98,8 +98,8 @@ window.onpageshow = function(evt) {
> 	if (document.getElementById("errorDiv").innerText == "")
> 		document.getElementById("errorDiv").innerText = "All tests passed.";
> 
>-	if (window.layoutTestController)
>-		layoutTestController.notifyDone();
>+	if (window.testRunner)
>+		testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/fast/loader/resources/click-fragment-link.html
>===================================================================
>--- LayoutTests/fast/loader/resources/click-fragment-link.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/click-fragment-link.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
> 
> function loaded() {
>-    if (window.layoutTestController) {
>+    if (window.testRunner) {
>         var element = document.getElementById("fragmentlink");
>         eventSender.mouseMoveTo(element.offsetLeft + (element.offsetWidth / 2), element.offsetTop + (element.offsetHeight / 2));
>         eventSender.mouseDown();
>@@ -11,8 +11,8 @@ function loaded() {
> 
> function hashChanged()
> {
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/fast/loader/resources/document-with-fragment-url-test.html
>===================================================================
>--- LayoutTests/fast/loader/resources/document-with-fragment-url-test.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/document-with-fragment-url-test.html	(working copy)
>@@ -28,8 +28,8 @@ function loaded()
>         eventSender.mouseUp();
>     } else {
>         alert("Second load complete.  URL's current hash is " + documentURLHash());
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }
> }
> 
>Index: LayoutTests/fast/loader/resources/fail-and-notify-done.html
>===================================================================
>--- LayoutTests/fast/loader/resources/fail-and-notify-done.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/fail-and-notify-done.html	(working copy)
>@@ -1,6 +1,6 @@
> <body>
> FAIL
> <script>
>-if (window.layoutTestController)
>-  layoutTestController.notifyDone()
>+if (window.testRunner)
>+  testRunner.notifyDone()
> </script>
>Index: LayoutTests/fast/loader/resources/form-state-restore-with-locked-back-forward-list-3.html
>===================================================================
>--- LayoutTests/fast/loader/resources/form-state-restore-with-locked-back-forward-list-3.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/form-state-restore-with-locked-back-forward-list-3.html	(working copy)
>@@ -3,7 +3,7 @@
> <script src="../../js/resources/js-test-pre.js"></script>
> <script>
> shouldBeEqualToString("location.search", '?TestName1=Ok1&TestName2=Ok2');
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
> </script>
> </body>
>Index: LayoutTests/fast/loader/resources/form-submission-before-load-page3.html
>===================================================================
>--- LayoutTests/fast/loader/resources/form-submission-before-load-page3.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/form-submission-before-load-page3.html	(working copy)
>@@ -1,5 +1,5 @@
> Done.
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
> </script>
>Index: LayoutTests/fast/loader/resources/invalid-charset-on-script-crashes-loader.js
>===================================================================
>--- LayoutTests/fast/loader/resources/invalid-charset-on-script-crashes-loader.js	(revision 122551)
>+++ LayoutTests/fast/loader/resources/invalid-charset-on-script-crashes-loader.js	(working copy)
>@@ -1,3 +1,3 @@
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> document.writeln("Success!");
>Index: LayoutTests/fast/loader/resources/location-change-aborts-parsing-fail.html
>===================================================================
>--- LayoutTests/fast/loader/resources/location-change-aborts-parsing-fail.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/location-change-aborts-parsing-fail.html	(working copy)
>@@ -1,5 +1,5 @@
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
> </script>
> FAIL
>Index: LayoutTests/fast/loader/resources/location-change-aborts-parsing-pass.html
>===================================================================
>--- LayoutTests/fast/loader/resources/location-change-aborts-parsing-pass.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/location-change-aborts-parsing-pass.html	(working copy)
>@@ -1,5 +1,5 @@
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
> </script>
> PASS
>Index: LayoutTests/fast/loader/resources/notify-done.html
>===================================================================
>--- LayoutTests/fast/loader/resources/notify-done.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/notify-done.html	(working copy)
>@@ -1,4 +1,4 @@
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
> </script>
>Index: LayoutTests/fast/loader/resources/onunload-form-submit-failure.html
>===================================================================
>--- LayoutTests/fast/loader/resources/onunload-form-submit-failure.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/onunload-form-submit-failure.html	(working copy)
>@@ -3,8 +3,8 @@
>         <script>
>             function continueTestAfterNavigation()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.notifyDone();
>+                if (window.testRunner)
>+                    testRunner.notifyDone();
>             }
>         </script>
>     </head>
>Index: LayoutTests/fast/loader/resources/onunload-form-submit-success.html
>===================================================================
>--- LayoutTests/fast/loader/resources/onunload-form-submit-success.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/onunload-form-submit-success.html	(working copy)
>@@ -3,8 +3,8 @@
>         <script>
>             function continueTestAfterNavigation()
>             {
>-                if (window.layoutTestController)
>-                    layoutTestController.notifyDone();
>+                if (window.testRunner)
>+                    testRunner.notifyDone();
>             }
>         </script>
>     </head>
>Index: LayoutTests/fast/loader/resources/pass-and-notify-done.html
>===================================================================
>--- LayoutTests/fast/loader/resources/pass-and-notify-done.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/pass-and-notify-done.html	(working copy)
>@@ -1,6 +1,6 @@
> <body>
> PASS
> <script>
>-if (window.layoutTestController)
>-  layoutTestController.notifyDone()
>+if (window.testRunner)
>+  testRunner.notifyDone()
> </script>
>Index: LayoutTests/fast/loader/resources/subframe-navigate-during-main-frame-load2.html
>===================================================================
>--- LayoutTests/fast/loader/resources/subframe-navigate-during-main-frame-load2.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/subframe-navigate-during-main-frame-load2.html	(working copy)
>@@ -4,7 +4,7 @@
> 
> function runTest()
> {
>-    document.getElementById("subframe").contentWindow.location = 'data:text/html,<body onload="layoutTestController.notifyDone();"></body>';
>+    document.getElementById("subframe").contentWindow.location = 'data:text/html,<body onload="testRunner.notifyDone();"></body>';
> }
> 
> </script>
>Index: LayoutTests/fast/loader/resources/subframe-notify-done.html
>===================================================================
>--- LayoutTests/fast/loader/resources/subframe-notify-done.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/subframe-notify-done.html	(working copy)
>@@ -2,8 +2,8 @@
> <head>
> <script>
> function loaded() {
>-    if (window.layoutTestController) {
>-        layoutTestController.notifyDone();
>+    if (window.testRunner) {
>+        testRunner.notifyDone();
>     }
> }
> </script>
>Index: LayoutTests/fast/loader/resources/submit-form-while-parsing-subframe.html
>===================================================================
>--- LayoutTests/fast/loader/resources/submit-form-while-parsing-subframe.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/submit-form-while-parsing-subframe.html	(working copy)
>@@ -1,8 +1,8 @@
> <form name="form" method="POST" action="about:blank"></form>
> <script type="text/javascript">
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> document.forms.form.submit();
> setTimeout("location='resources/submit-form-while-parsing-success.html'", 0);
>Index: LayoutTests/fast/loader/resources/submit-form-while-parsing-success.html
>===================================================================
>--- LayoutTests/fast/loader/resources/submit-form-while-parsing-success.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/submit-form-while-parsing-success.html	(working copy)
>@@ -1 +1 @@
>-<body onload="layoutTestController.notifyDone()">PASSED: If we successfully got here without an assertion or crash, all is well.</body>
>+<body onload="testRunner.notifyDone()">PASSED: If we successfully got here without an assertion or crash, all is well.</body>
>Index: LayoutTests/fast/loader/resources/unschedule-relayout-after-unload-target.html
>===================================================================
>--- LayoutTests/fast/loader/resources/unschedule-relayout-after-unload-target.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/unschedule-relayout-after-unload-target.html	(working copy)
>@@ -3,8 +3,8 @@
>   window.setTimeout(
>     function() {
>         document.body.innerHTML = 'SUCCESS: Navigated';
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }, 0);
> </script>
> </html>
>Index: LayoutTests/fast/loader/resources/window-clearing2.html
>===================================================================
>--- LayoutTests/fast/loader/resources/window-clearing2.html	(revision 122551)
>+++ LayoutTests/fast/loader/resources/window-clearing2.html	(working copy)
>@@ -20,8 +20,8 @@ function test() {
>         o = o.__proto__;
>     } while(o);
>     
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> </script>
> </head>
>Index: LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html	(working copy)
>@@ -2,11 +2,11 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>+if (window.testRunner) {
>     if (!sessionStorage.stage)
>-        layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+        testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function lastPathComponent(url)
>@@ -90,8 +90,8 @@ onhashchange = function(event)
>    if (hashOf(event.newURL) == "#FirstEntryWillLaterBeReactivated") {
>         alert("Test complete");
>         sessionStorage.clear();
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }
> }
> 
>Index: LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back.html	(working copy)
>@@ -2,11 +2,11 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>+if (window.testRunner) {
>     if (!sessionStorage.stage)
>-        layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+        testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function lastPathComponent()
>@@ -68,8 +68,8 @@ function statePopped()
>     else if (event.state == "FirstEntryWillLaterBeReactivated") {
>         alert("Test complete");
>         sessionStorage.clear();
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }
> }
> 
>Index: LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-addeventlistener.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-addeventlistener.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-addeventlistener.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function log(txt)
>@@ -35,8 +35,8 @@ function statePopped()
>     log("State popped - " + event.state + " (type " + typeof event.state + ")");
>     if (event.state == null)
>         history.forward();
>-    else if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    else if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> window.addEventListener("popstate", statePopped);
>Index: LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-attribute.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-attribute.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-attribute.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function log(txt)
>@@ -36,8 +36,8 @@ function statePopped()
>     if (event.state == null) {
>         document.body.onpopstate = statePopped;
>         history.forward();
>-    } else if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    } else if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-inline-attribute.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-inline-attribute.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-inline-attribute.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function log(txt)
>@@ -36,8 +36,8 @@ function statePopped()
>     if (event.state == null) {
>         document.body.onpopstate = statePopped;
>         history.forward();
>-    } else if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    } else if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-window-attribute.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-window-attribute.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-window-attribute.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function log(txt)
>@@ -35,8 +35,8 @@ function statePopped()
>     log("State popped - " + event.state + " (type " + typeof event.state + ")");
>     if (event.state == null)
>         history.forward();
>-    else if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    else if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> window.onpopstate = statePopped;
>Index: LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html	(working copy)
>@@ -11,9 +11,9 @@ var testWindow;
> 
> onload = function()
> {
>-    if (window.layoutTestController) {
>-        layoutTestController.setCanOpenWindows();
>-        layoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
>+    if (window.testRunner) {
>+        testRunner.setCanOpenWindows();
>+        testRunner.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
>     }
>     testWindow = window.open('resources/popstate-fires-with-page-cache-1.html');
>     if (!testWindow)
>Index: LayoutTests/fast/loader/stateobjects/pushstate-clears-forward-history.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/pushstate-clears-forward-history.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/pushstate-clears-forward-history.html	(working copy)
>@@ -2,10 +2,10 @@
> onload = function() {
>   if (location.search.substring(1).length == 0) {
>     sessionStorage.testStage = 0;
>-    if (window.layoutTestController) {
>-      layoutTestController.dumpAsText();
>-      layoutTestController.dumpBackForwardList();
>-      layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+      testRunner.dumpAsText();
>+      testRunner.dumpBackForwardList();
>+      testRunner.waitUntilDone();
>     }
>   }
> 
>@@ -23,8 +23,8 @@ onload = function() {
>         break;
>       case 3:
>         history.pushState(null, null);
>-        if (window.layoutTestController)
>-          layoutTestController.notifyDone();
>+        if (window.testRunner)
>+          testRunner.notifyDone();
>         break;
>       }
>     }, 0);
>Index: LayoutTests/fast/loader/stateobjects/pushstate-in-data-url-denied.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/pushstate-in-data-url-denied.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/pushstate-in-data-url-denied.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> window.onload = function() {
>     window.location = 'data:text/html,' +
>@@ -12,8 +12,8 @@ window.onload = function() {
>     '} catch(e) {' +
>         'document.write("PASS: data URLs cannot be manipulated via pushState.");' +
>     '}' +
>-    'if (window.layoutTestController)' +
>-        'layoutTestController.notifyDone();' +
>+    'if (window.testRunner)' +
>+        'testRunner.notifyDone();' +
>     '%3C/script%3E';
> }
> </script>
>Index: LayoutTests/fast/loader/stateobjects/pushstate-in-iframe.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/pushstate-in-iframe.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/pushstate-in-iframe.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> </script>
> <iframe src="resources/pushstate-in-iframe-child.html">
>Index: LayoutTests/fast/loader/stateobjects/pushstate-object-types.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/pushstate-object-types.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/pushstate-object-types.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function log(txt)
>@@ -59,8 +59,8 @@ onpopstate = function(event)
>     
>     if (event.state != "FirstEntry")
>         history.back();
>-    else if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    else if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/fast/loader/stateobjects/pushstate-then-replacestate.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/pushstate-then-replacestate.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/pushstate-then-replacestate.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function log(txt)
>@@ -37,8 +37,8 @@ onpopstate = function(event)
>     log("State popped - " + event.state + " (type " + typeof event.state + ")");
>     if (event.state == null)
>         history.forward();
>-    else if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    else if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/fast/loader/stateobjects/pushstate-updates-location.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/pushstate-updates-location.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/pushstate-updates-location.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-if (window.layoutTestController)
>-  layoutTestController.dumpAsText();
>+if (window.testRunner)
>+  testRunner.dumpAsText();
> 
> onload = function() {
>   history.pushState(null, null, "?foo");
>Index: LayoutTests/fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function log(txt)
>@@ -59,8 +59,8 @@ onpopstate = function(event)
>     log("State popped with event " + event.state + " (type " + typeof event.state + ") and last path component " + lastPathComponent(location.href));
>     if (event.state != "OriginalEntry")
>         setTimeout("history.back();", 0);
>-    else if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    else if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> onhashchange = function(event)
>Index: LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html	(working copy)
>@@ -1,15 +1,15 @@
> <script>
> 
>-if (window.layoutTestController) {
>-  layoutTestController.clearBackForwardList();
>-  layoutTestController.dumpAsText();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.clearBackForwardList();
>+  testRunner.dumpAsText();
>+  testRunner.waitUntilDone();
> }
> 
> onpopstate = function() {
>     history.pushState(null, null);
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> onload = function() {
>Index: LayoutTests/fast/loader/stateobjects/pushstate-without-history.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/pushstate-without-history.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/pushstate-without-history.html	(working copy)
>@@ -2,11 +2,11 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.setCanOpenWindows();
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.setCanOpenWindows();
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> </script>
> <body onload="window.open('resources/pushstate-without-history.html');" >
>Index: LayoutTests/fast/loader/stateobjects/replacestate-in-iframe.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/replacestate-in-iframe.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/replacestate-in-iframe.html	(working copy)
>@@ -1,8 +1,8 @@
> <script>
>-if (window.layoutTestController) {
>-  layoutTestController.dumpAsText();
>-  layoutTestController.setCanOpenWindows();
>-  layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+  testRunner.dumpAsText();
>+  testRunner.setCanOpenWindows();
>+  testRunner.waitUntilDone();
> }
> 
> // This is a test that replaceState called on an inner frame does not modify
>@@ -18,8 +18,8 @@ function notifyDone(result) {
> 
>   document.body.innerText = result;
> 
>-  if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+  if (window.testRunner)
>+    testRunner.notifyDone();
> }
> 
> function windowLoaded() {
>Index: LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html	(working copy)
>@@ -2,9 +2,9 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function log(txt)
>@@ -20,8 +20,8 @@ window.onload = function()
>         window.location = window.location.href + "?PASS";
>     } else {
>         log(window.location.search.slice(1));
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }
> }
> 
>Index: LayoutTests/fast/loader/stateobjects/replacestate-then-pushstate.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/replacestate-then-pushstate.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/replacestate-then-pushstate.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function log(txt)
>@@ -37,8 +37,8 @@ onpopstate = function(event)
>     log("State popped - " + event.state + " (type " + typeof event.state + ")");
>     if (event.state == "OriginalHistoryItem")
>         history.forward();
>-    else if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    else if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/fast/loader/stateobjects/replacestate-updates-location.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/replacestate-updates-location.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/replacestate-updates-location.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-if (window.layoutTestController)
>-  layoutTestController.dumpAsText();
>+if (window.testRunner)
>+  testRunner.dumpAsText();
> 
> onload = function() {
>   history.replaceState(null, null, "?foo");
>Index: LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html	(working copy)
>@@ -1,8 +1,8 @@
> <html>
> <script>
> 
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function runTest()
> {
>Index: LayoutTests/fast/loader/stateobjects/state-attribute-history-getter.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/state-attribute-history-getter.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/state-attribute-history-getter.html	(working copy)
>@@ -6,10 +6,10 @@ function log(msg) {
>     document.querySelector("#log").innerHTML += msg + "<br>";
> }
> 
>-if (window.layoutTestController) {
>-    layoutTestController.clearBackForwardList();
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.clearBackForwardList();
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function test() {
>@@ -23,7 +23,7 @@ function test() {
>     } catch (e) {
>         // history.state is not configurable in JSC.
>         log(e.name == "TypeError" ? "PASS" : ("FAIL: unexpected exception: " + e));
>-        layoutTestController.notifyDone();
>+        testRunner.notifyDone();
>         return;
>     }
> 
>@@ -39,8 +39,8 @@ function test() {
>             log("FAIL: e.state expected 42, was " + e.state + " (of type " + typeof e.state + ")");
>         else
>             log("PASS");
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }
> 
>     history.back();
>Index: LayoutTests/fast/loader/stateobjects/state-attribute-object-types.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/state-attribute-object-types.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/state-attribute-object-types.html	(working copy)
>@@ -7,8 +7,8 @@
> <script>
>     description('This test calls pushState with state objects of all the different object types supported by the HTML5 "internal structured cloning algorithm" and makes sure the state attribute returns the expected objects.');
> 
>-    if (window.layoutTestController)
>-        layoutTestController.clearBackForwardList();
>+    if (window.testRunner)
>+        testRunner.clearBackForwardList();
> 
>     shouldBeDefined("history.state");
>     debug("\nhistory.state should initially be null.");
>Index: LayoutTests/fast/loader/stateobjects/state-attribute-only-one-deserialization.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/state-attribute-only-one-deserialization.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/state-attribute-only-one-deserialization.html	(working copy)
>@@ -8,9 +8,9 @@
>     description("Make sure the same deserialization of the state object is used every time (both in the history object and popstate events).");
> 
>     window.jsTestIsAsync = true;
>-    if (window.layoutTestController) {
>-        layoutTestController.clearBackForwardList();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.clearBackForwardList();
>+        testRunner.waitUntilDone();
>     }
> 
>     shouldBeDefined("history.state");
>Index: LayoutTests/fast/loader/stateobjects/state-attribute-popstate-event.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/state-attribute-popstate-event.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/state-attribute-popstate-event.html	(working copy)
>@@ -8,9 +8,9 @@
>     description("Check that PopStateEvent.state always has a correct value.");
> 
>     window.jsTestIsAsync = true;
>-    if (window.layoutTestController) {
>-        layoutTestController.clearBackForwardList();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.clearBackForwardList();
>+        testRunner.waitUntilDone();
>     }
> 
>     shouldBeDefined("history.state");
>Index: LayoutTests/fast/loader/stateobjects/state-url-sets-links-visited.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/state-url-sets-links-visited.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/state-url-sets-links-visited.html	(working copy)
>@@ -1,8 +1,8 @@
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.keepWebHistory();
>-    layoutTestController.dumpAsText();
>+if (window.testRunner) {
>+    testRunner.keepWebHistory();
>+    testRunner.dumpAsText();
> }
> 
> function loaded()
>@@ -10,9 +10,9 @@ function loaded()
>     window.history.replaceState(null, "Title", "replacedURL.html");
>     window.history.pushState(null, "Title", "pushedURL.html");
> 
>-    if (window.layoutTestController) {
>-        var style1 = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('link1'));
>-        var style2 = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('link2'));
>+    if (window.testRunner) {
>+        var style1 = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('link1'));
>+        var style2 = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('link2'));
>         var result = document.createElement("p");
>         if (style1.color != "rgb(255, 165, 0)" || style2.color != "rgb(255, 165, 0)")
>             result.innerText = "FAIL";
>Index: LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html	(working copy)
>@@ -11,8 +11,8 @@ onpopstate = function() {
>   } else {
>     topWin.document.body.innerHTML = "PASS";
>   }
>-  if (topWin.layoutTestController)
>-    topWin.layoutTestController.notifyDone();
>+  if (topWin.testRunner)
>+    topWin.testRunner.notifyDone();
> }
> 
> onload = function() {
>Index: LayoutTests/fast/loader/stateobjects/resources/pushstate-without-history.html
>===================================================================
>--- LayoutTests/fast/loader/stateobjects/resources/pushstate-without-history.html	(revision 122551)
>+++ LayoutTests/fast/loader/stateobjects/resources/pushstate-without-history.html	(working copy)
>@@ -8,8 +8,8 @@ function runTest()
>     history.pushState("New history Item", "2Ping!");
>     history.pushState("New history Item", "3Ping!");
>     window.opener.document.getElementById("result").innerText = "history.length is: " + history.length;
>-    if (window.opener.layoutTestController)
>-        window.opener.layoutTestController.notifyDone();
>+    if (window.opener.testRunner)
>+        window.opener.testRunner.notifyDone();
>     window.close()
> }
> 
>Index: LayoutTests/fast/media/color-does-not-include-alpha.html
>===================================================================
>--- LayoutTests/fast/media/color-does-not-include-alpha.html	(revision 122551)
>+++ LayoutTests/fast/media/color-does-not-include-alpha.html	(working copy)
>@@ -13,8 +13,8 @@
> </style>
> <div id=test>This box should be green.</div>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
>     var backgroundColor = getComputedStyle(document.getElementById("test"), null).backgroundColor;
>     const expectedBackgroundColor = "rgb(0, 128, 0)";
>     if (backgroundColor === expectedBackgroundColor)
>Index: LayoutTests/fast/media/invalid-lengths.html
>===================================================================
>--- LayoutTests/fast/media/invalid-lengths.html	(revision 122551)
>+++ LayoutTests/fast/media/invalid-lengths.html	(working copy)
>@@ -2,8 +2,8 @@
> <pre id="console">
> </pre>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
>   
>     function log(message)
>     {
>Index: LayoutTests/fast/media/lifetime.html
>===================================================================
>--- LayoutTests/fast/media/lifetime.html	(revision 122551)
>+++ LayoutTests/fast/media/lifetime.html	(working copy)
>@@ -3,9 +3,9 @@
> <div id=result>Testing...</div>
> <iframe src="about:blank"></iframe>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function gc()
>@@ -39,8 +39,8 @@ function test()
>         gc();
>         try { m.matchMedium("foobar") } catch (ex) { }
>         document.getElementById("result").innerHTML = "PASS";
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     }, 0);
> }
> </script>
>Index: LayoutTests/fast/media/matchmedium-query-api.html
>===================================================================
>--- LayoutTests/fast/media/matchmedium-query-api.html	(revision 122551)
>+++ LayoutTests/fast/media/matchmedium-query-api.html	(working copy)
>@@ -5,8 +5,8 @@
> 
> </style>
> <script type="text/javascript" charset="utf-8">
>-  if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+  if (window.testRunner)
>+    testRunner.dumpAsText();
>   
>   function log(m)
>   {
>Index: LayoutTests/fast/media/media-query-list-01.html
>===================================================================
>--- LayoutTests/fast/media/media-query-list-01.html	(revision 122551)
>+++ LayoutTests/fast/media/media-query-list-01.html	(working copy)
>@@ -5,8 +5,8 @@
> 
> </style>
> <script type="text/javascript" charset="utf-8">
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(m)
>     {
>Index: LayoutTests/fast/media/media-query-list-02.html
>===================================================================
>--- LayoutTests/fast/media/media-query-list-02.html	(revision 122551)
>+++ LayoutTests/fast/media/media-query-list-02.html	(working copy)
>@@ -5,8 +5,8 @@
> 
> </style>
> <script type="text/javascript" charset="utf-8">
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(m) {
>         document.getElementById('results').innerHTML += m + '<br>';
>@@ -22,10 +22,10 @@
> 
>     function runTests()
>     {
>-        if (!window.layoutTestController)
>+        if (!window.testRunner)
>             return;
> 
>-        layoutTestController.setViewModeMediaFeature("windowed");
>+        testRunner.setViewModeMediaFeature("windowed");
> 
>         windowedQuery = window.matchMedia("(-webkit-view-mode: windowed)");
>         floatingQuery = window.matchMedia("(-webkit-view-mode: floating)");
>@@ -43,13 +43,13 @@
>         maximizedQuery.addListener(callback2);
> 
>         log("------------- minimized -------------");
>-        layoutTestController.setViewModeMediaFeature("minimized");
>+        testRunner.setViewModeMediaFeature("minimized");
>         log("------------- maximized -------------");
>-        layoutTestController.setViewModeMediaFeature("maximized");
>+        testRunner.setViewModeMediaFeature("maximized");
>         log("------------- windowed -------------");
>-        layoutTestController.setViewModeMediaFeature("windowed");
>+        testRunner.setViewModeMediaFeature("windowed");
>         log("------------- floating -------------");
>-        layoutTestController.setViewModeMediaFeature("floating");
>+        testRunner.setViewModeMediaFeature("floating");
>     }
> 
> </script>
>Index: LayoutTests/fast/media/media-query-list-03.html
>===================================================================
>--- LayoutTests/fast/media/media-query-list-03.html	(revision 122551)
>+++ LayoutTests/fast/media/media-query-list-03.html	(working copy)
>@@ -5,8 +5,8 @@
> 
> </style>
> <script type="text/javascript" charset="utf-8">
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(m) {
>         document.getElementById('results').innerHTML += m + '<br>';
>@@ -22,10 +22,10 @@
> 
>     function runTests()
>     {
>-        if (!window.layoutTestController)
>+        if (!window.testRunner)
>             return;
> 
>-        layoutTestController.setViewModeMediaFeature("windowed");
>+        testRunner.setViewModeMediaFeature("windowed");
> 
>         windowedQuery = window.matchMedia("(-webkit-view-mode: windowed)");
>         minimizedQuery = window.matchMedia("(-webkit-view-mode: minimized)");
>@@ -37,27 +37,27 @@
>         minimizedQuery.addListener(callback2);
> 
>         log("------------- minimized -------------");
>-        layoutTestController.setViewModeMediaFeature("minimized");
>+        testRunner.setViewModeMediaFeature("minimized");
>         log("------------- windowed -------------");
>-        layoutTestController.setViewModeMediaFeature("windowed");
>+        testRunner.setViewModeMediaFeature("windowed");
> 
>         log("<br><br>removing windowed[1] and minimized[2]<br>");
>         windowedQuery.removeListener(callback1);
>         minimizedQuery.removeListener(callback2);
> 
>         log("------------- minimized -------------");
>-        layoutTestController.setViewModeMediaFeature("minimized");
>+        testRunner.setViewModeMediaFeature("minimized");
>         log("------------- windowed -------------");
>-        layoutTestController.setViewModeMediaFeature("windowed");
>+        testRunner.setViewModeMediaFeature("windowed");
> 
>         log("<br><br>adding windowed[1] and minimized[2]<br>");
>         windowedQuery.addListener(callback1);
>         minimizedQuery.addListener(callback2);
> 
>         log("------------- minimized -------------");
>-        layoutTestController.setViewModeMediaFeature("minimized");
>+        testRunner.setViewModeMediaFeature("minimized");
>         log("------------- windowed -------------");
>-        layoutTestController.setViewModeMediaFeature("windowed");
>+        testRunner.setViewModeMediaFeature("windowed");
> 
>     }
> 
>Index: LayoutTests/fast/media/media-query-list-04.html
>===================================================================
>--- LayoutTests/fast/media/media-query-list-04.html	(revision 122551)
>+++ LayoutTests/fast/media/media-query-list-04.html	(working copy)
>@@ -3,10 +3,10 @@
> <title>Test CSSOM View module: MediaQueryList interface</title>
> <script type="text/javascript" charset="utf-8">
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>-        layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>+        testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>     }
> 
>     function log(m) {
>@@ -47,21 +47,21 @@
>             // if this point is reached the page is comming from the page cache.
> 
>             log("------------- minimized -------------");
>-            layoutTestController.setViewModeMediaFeature("minimized");
>+            testRunner.setViewModeMediaFeature("minimized");
>             log("------------- maximized -------------");
>-            layoutTestController.setViewModeMediaFeature("maximized");
>+            testRunner.setViewModeMediaFeature("maximized");
>             log("------------- windowed -------------");
>-            layoutTestController.setViewModeMediaFeature("windowed");
>+            testRunner.setViewModeMediaFeature("windowed");
>             log("------------- floating -------------");
>-            layoutTestController.setViewModeMediaFeature("floating");
>+            testRunner.setViewModeMediaFeature("floating");
> 
>-            setTimeout(function() { if (window.layoutTestController) layoutTestController.notifyDone(); }, 0);
>+            setTimeout(function() { if (window.testRunner) testRunner.notifyDone(); }, 0);
> 
>         }
>     }
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.setViewModeMediaFeature("windowed");
>+    if (window.testRunner) {
>+        testRunner.setViewModeMediaFeature("windowed");
>         window.onpageshow = pageshow;
>     }
> 
>Index: LayoutTests/fast/media/media-query-list-05.html
>===================================================================
>--- LayoutTests/fast/media/media-query-list-05.html	(revision 122551)
>+++ LayoutTests/fast/media/media-query-list-05.html	(working copy)
>@@ -5,8 +5,8 @@
> 
> </style>
> <script type="text/javascript" charset="utf-8">
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(m) {
>         document.getElementById('results').innerHTML += m + '<br>';
>@@ -22,10 +22,10 @@
> 
>     function runTests()
>     {
>-        if (!window.layoutTestController)
>+        if (!window.testRunner)
>             return;
> 
>-        layoutTestController.setViewModeMediaFeature("windowed");
>+        testRunner.setViewModeMediaFeature("windowed");
> 
>         var query = window.matchMedia("(-webkit-view-mode: windowed)");
> 
>@@ -33,7 +33,7 @@
>         query.addListener(callback1);
>         query.addListener(callback2);
> 
>-        layoutTestController.setViewModeMediaFeature("minimized");
>+        testRunner.setViewModeMediaFeature("minimized");
>     }
> 
> </script>
>Index: LayoutTests/fast/media/media-query-list-06.html
>===================================================================
>--- LayoutTests/fast/media/media-query-list-06.html	(revision 122551)
>+++ LayoutTests/fast/media/media-query-list-06.html	(working copy)
>@@ -5,8 +5,8 @@
> 
> </style>
> <script type="text/javascript" charset="utf-8">
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(m) {
>         document.getElementById('results').innerHTML += m + '<br>';
>@@ -14,14 +14,14 @@
> 
>     function runTests()
>     {
>-        if (!window.layoutTestController)
>+        if (!window.testRunner)
>             return;
> 
>-        layoutTestController.setViewModeMediaFeature("windowed");
>+        testRunner.setViewModeMediaFeature("windowed");
> 
>         var query = window.matchMedia("(-webkit-view-mode: windowed)");
>         log('Query result before changing view-mode: ' + query.matches);
>-        layoutTestController.setViewModeMediaFeature("minimized");
>+        testRunner.setViewModeMediaFeature("minimized");
>         log('Query result after changing view-mode: ' + query.matches);
>     }
> 
>Index: LayoutTests/fast/media/media-query-list-07.html
>===================================================================
>--- LayoutTests/fast/media/media-query-list-07.html	(revision 122551)
>+++ LayoutTests/fast/media/media-query-list-07.html	(working copy)
>@@ -5,8 +5,8 @@
> 
> </style>
> <script type="text/javascript" charset="utf-8">
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(m) {
>         document.getElementById('results').innerHTML += m + '<br>';
>@@ -22,10 +22,10 @@
> 
>     function runTests()
>     {
>-        if (!window.layoutTestController)
>+        if (!window.testRunner)
>             return;
> 
>-        layoutTestController.setViewModeMediaFeature("windowed");
>+        testRunner.setViewModeMediaFeature("windowed");
> 
>         var query = window.matchMedia("(-webkit-view-mode: windowed)");
> 
>@@ -35,7 +35,7 @@
>         query.addListener([1,2]);
>         query.addListener(callback2);
> 
>-        layoutTestController.setViewModeMediaFeature("minimized");
>+        testRunner.setViewModeMediaFeature("minimized");
>     }
> 
> </script>
>Index: LayoutTests/fast/media/media-query-list-callback.html
>===================================================================
>--- LayoutTests/fast/media/media-query-list-callback.html	(revision 122551)
>+++ LayoutTests/fast/media/media-query-list-callback.html	(working copy)
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> <p>If this doesn't crash...</p>
> <p style="color:green;">PASS</p>
>Index: LayoutTests/fast/media/media-svg-crash.html
>===================================================================
>--- LayoutTests/fast/media/media-svg-crash.html	(revision 122551)
>+++ LayoutTests/fast/media/media-svg-crash.html	(working copy)
>@@ -1,7 +1,7 @@
> <html>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> <img src='data:image/svg+xml,<!DOCTYPEg PUBLIC "" "/"><g xmlns="http://www.w3.org/2000/svg"><style>@media(max-color:5){*{</style>'>
> PASS - SVG image with media type does not crash.
>Index: LayoutTests/fast/media/mq-pointer.html
>===================================================================
>--- LayoutTests/fast/media/mq-pointer.html	(revision 122551)
>+++ LayoutTests/fast/media/mq-pointer.html	(working copy)
>@@ -5,8 +5,8 @@
> 
> </style>
> <script type="text/javascript" charset="utf-8">
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(m) {
>         document.getElementById('results').innerHTML += m + '<br>';
>Index: LayoutTests/fast/media/print-restores-previous-mediatype.html
>===================================================================
>--- LayoutTests/fast/media/print-restores-previous-mediatype.html	(revision 122551)
>+++ LayoutTests/fast/media/print-restores-previous-mediatype.html	(working copy)
>@@ -5,9 +5,9 @@
> 
> </style>
> <script type="text/javascript" charset="utf-8">
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.setMediaType("handheld");
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.setMediaType("handheld");
>     }
> 
>     function log(m)
>Index: LayoutTests/fast/media/update-media-query-css-parser.html
>===================================================================
>--- LayoutTests/fast/media/update-media-query-css-parser.html	(revision 122551)
>+++ LayoutTests/fast/media/update-media-query-css-parser.html	(working copy)
>@@ -10,8 +10,8 @@
> }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> </head>
> <body>
>Index: LayoutTests/fast/media/view-mode-media-feature.html
>===================================================================
>--- LayoutTests/fast/media/view-mode-media-feature.html	(revision 122551)
>+++ LayoutTests/fast/media/view-mode-media-feature.html	(working copy)
>@@ -16,8 +16,8 @@
>         }
>     </style>
>     <script>
>-        if (window.layoutTestController)
>-            layoutTestController.setViewModeMediaFeature("minimized");
>+        if (window.testRunner)
>+            testRunner.setViewModeMediaFeature("minimized");
>     </script>
> </head>
> <body>
>Index: LayoutTests/fast/multicol/anonymous-block-split-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/anonymous-block-split-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/anonymous-block-split-crash.html	(working copy)
>@@ -8,8 +8,8 @@
> #test4 { float: right; }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> onload = function() {
>     test0 = document.createElement('div');
>Index: LayoutTests/fast/multicol/break-properties.html
>===================================================================
>--- LayoutTests/fast/multicol/break-properties.html	(revision 122551)
>+++ LayoutTests/fast/multicol/break-properties.html	(working copy)
>@@ -13,8 +13,8 @@
> </div>
> <pre id="console"></pre>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(message)
>     {
>Index: LayoutTests/fast/multicol/clone-block-children-inline-mismatch-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/clone-block-children-inline-mismatch-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/clone-block-children-inline-mismatch-crash.html	(working copy)
>@@ -8,8 +8,8 @@ Test passes if it does not crash.
> #div2 { -webkit-column-span: all; }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function runTest() 
> {
>Index: LayoutTests/fast/multicol/column-span-parent-continuation-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/column-span-parent-continuation-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/column-span-parent-continuation-crash.html	(working copy)
>@@ -8,9 +8,9 @@ h2 { -webkit-column-span: all; }
> </style>
> <script src="../js/resources/js-test-pre.js"></script>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> function runTest()
>@@ -22,8 +22,8 @@ function runTest()
>     gc();
>     document.body.innerHTML = "PASS";
> 
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> setTimeout("runTest()", 0);
>Index: LayoutTests/fast/multicol/content-height-zero-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/content-height-zero-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/content-height-zero-crash.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <p>
>     This tests for a crash when specifying multiple columns for a block with 0 content height.
>Index: LayoutTests/fast/multicol/flipped-blocks-hit-test.html
>===================================================================
>--- LayoutTests/fast/multicol/flipped-blocks-hit-test.html	(revision 122551)
>+++ LayoutTests/fast/multicol/flipped-blocks-hit-test.html	(working copy)
>@@ -11,8 +11,8 @@
> </div>
> <p id="result">The test did not run.</p>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     var offset = document.caretRangeFromPoint(38, 18).startOffset;
>     document.getElementById("result").innerText = offset === 26 ? "PASS" : "FAIL";
>Index: LayoutTests/fast/multicol/float-truncation.html
>===================================================================
>--- LayoutTests/fast/multicol/float-truncation.html	(revision 122551)
>+++ LayoutTests/fast/multicol/float-truncation.html	(working copy)
>@@ -95,8 +95,8 @@
>             failures++
>     }
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         document.getElementById("tests").style.display = "none";
>     }
> 
>Index: LayoutTests/fast/multicol/gap-non-negative.html
>===================================================================
>--- LayoutTests/fast/multicol/gap-non-negative.html	(revision 122551)
>+++ LayoutTests/fast/multicol/gap-non-negative.html	(working copy)
>@@ -7,8 +7,8 @@
> <p id = "result"></p>
> <div id="target" style="-webkit-column-count: 4; -webkit-column-gap: -10px;"></div>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     var style = getComputedStyle(document.getElementById("target"));
>     var columnGap = style.getPropertyValue("-webkit-column-gap");
>Index: LayoutTests/fast/multicol/hit-test-above-or-below.html
>===================================================================
>--- LayoutTests/fast/multicol/hit-test-above-or-below.html	(revision 122551)
>+++ LayoutTests/fast/multicol/hit-test-above-or-below.html	(working copy)
>@@ -27,8 +27,8 @@
>             log ("FAIL: Character at " + x + ", " + y + " is " + actualCharacter + ". Expected " + character + ".");
>     }
> 
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     test(150, 25, "1");
>     test(350, 25, "d");
>Index: LayoutTests/fast/multicol/hit-test-float.html
>===================================================================
>--- LayoutTests/fast/multicol/hit-test-float.html	(revision 122551)
>+++ LayoutTests/fast/multicol/hit-test-float.html	(working copy)
>@@ -19,8 +19,8 @@
> </div>
> <div id="result">FAIL: Test did not run.</div>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     var result = document.getElementById("result");
>     var hitElement = document.elementFromPoint(370, 250);
>Index: LayoutTests/fast/multicol/huge-column-count.html
>===================================================================
>--- LayoutTests/fast/multicol/huge-column-count.html	(revision 122551)
>+++ LayoutTests/fast/multicol/huge-column-count.html	(working copy)
>@@ -5,6 +5,6 @@
> This test should not crash.
> </body>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
>Index: LayoutTests/fast/multicol/huge-column-gap-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/huge-column-gap-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/huge-column-gap-crash.html	(working copy)
>@@ -8,8 +8,8 @@ body {
> </style>
> 
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> </head>
> 
>Index: LayoutTests/fast/multicol/image-inside-nested-blocks-with-border.html
>===================================================================
>--- LayoutTests/fast/multicol/image-inside-nested-blocks-with-border.html	(revision 122551)
>+++ LayoutTests/fast/multicol/image-inside-nested-blocks-with-border.html	(working copy)
>@@ -30,8 +30,8 @@
>             failures++
>     }
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         document.getElementById("tests").style.display = "none";
>     }
> 
>Index: LayoutTests/fast/multicol/inherit-column-values.html
>===================================================================
>--- LayoutTests/fast/multicol/inherit-column-values.html	(revision 122551)
>+++ LayoutTests/fast/multicol/inherit-column-values.html	(working copy)
>@@ -31,8 +31,8 @@
>         output += (result == value) ? "\n" : (" expected " + value + "\n");
>     }
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         document.getElementById("parent").style.display = "none";
>     }
> 
>Index: LayoutTests/fast/multicol/initial-column-values.html
>===================================================================
>--- LayoutTests/fast/multicol/initial-column-values.html	(revision 122551)
>+++ LayoutTests/fast/multicol/initial-column-values.html	(working copy)
>@@ -35,8 +35,8 @@ Vestibulum a sapien. Phasellus ante lacu
>         output += (result == value) ? "\n" : (" expected " + value + "\n");
>     }
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         document.getElementById("columns-test").style.display = "none";
>         document.getElementById("count-test").style.display = "none";
>         document.getElementById("gap-test").style.display = "none";
>Index: LayoutTests/fast/multicol/negativeColumnWidth.html
>===================================================================
>--- LayoutTests/fast/multicol/negativeColumnWidth.html	(revision 122551)
>+++ LayoutTests/fast/multicol/negativeColumnWidth.html	(working copy)
>@@ -3,6 +3,6 @@ This test succeeds if it does not crash.
> <table><td style="-webkit-columns: -9999px;">
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
>Index: LayoutTests/fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html
>===================================================================
>--- LayoutTests/fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html	(revision 122551)
>+++ LayoutTests/fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html	(working copy)
>@@ -7,8 +7,8 @@
>     The test passes if it does not cause a crash or assertion failure.
> </p>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <div style="-webkit-columns: 2; width: 200px; height: 40px; font-family: ahem; -webkit-font-smoothing: none;">
>     <div style="height: 12px;"></div>
>Index: LayoutTests/fast/multicol/paginated-layer-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/paginated-layer-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/paginated-layer-crash.html	(working copy)
>@@ -26,6 +26,6 @@
>     </div>
> </div>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
>Index: LayoutTests/fast/multicol/renderer-positioned-assert-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/renderer-positioned-assert-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/renderer-positioned-assert-crash.html	(working copy)
>@@ -1,7 +1,7 @@
> <html>
>     <script>
>-        if (window.layoutTestController)
>-            layoutTestController.dumpAsText();
>+        if (window.testRunner)
>+            testRunner.dumpAsText();
>     </script>
>     <style>
>         .box
>Index: LayoutTests/fast/multicol/zeroColumnCount.html
>===================================================================
>--- LayoutTests/fast/multicol/zeroColumnCount.html	(revision 122551)
>+++ LayoutTests/fast/multicol/zeroColumnCount.html	(working copy)
>@@ -3,6 +3,6 @@ This test succeeds if it does not crash.
> <h2 style="-webkit-column-count: 0;">
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
>Index: LayoutTests/fast/multicol/span/clone-before-after-content-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/clone-before-after-content-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/clone-before-after-content-crash.html	(working copy)
>@@ -7,8 +7,8 @@
>       #test4 { -webkit-column-span: all; }
>     </style>
>     <script>
>-	  if (window.layoutTestController)
>-	      layoutTestController.dumpAsText();
>+	  if (window.testRunner)
>+	      testRunner.dumpAsText();
>       function runTest(){
>         test1 = document.createElement('div');
>         test1.setAttribute('id', 'test1');
>Index: LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html	(working copy)
>@@ -1,8 +1,8 @@
> <html>
>     <head>
>         <script>
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
>         </script>
>     </head>
>     <style>
>Index: LayoutTests/fast/multicol/span/empty-anonymous-block-split-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/empty-anonymous-block-split-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/empty-anonymous-block-split-crash.html	(working copy)
>@@ -7,8 +7,8 @@
> #test3 { content: counter(c); -webkit-column-span: all; }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> onload = function() {
>     test0 = document.createElement('div');
>Index: LayoutTests/fast/multicol/span/positioned-child-not-removed-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/positioned-child-not-removed-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/positioned-child-not-removed-crash.html	(working copy)
>@@ -9,8 +9,8 @@ Test passes if it does not crash.
> .flexbox1 { display: -webkit-flexbox; padding-right: 10px; -webkit-transform: rotate3d(0, 1, 0, 90deg); }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function runTest() {
>     caption1 = document.createElement('caption');
>Index: LayoutTests/fast/multicol/span/positioned-objects-not-removed-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/positioned-objects-not-removed-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/positioned-objects-not-removed-crash.html	(working copy)
>@@ -12,8 +12,8 @@
> .c1:first-letter { content: ""; }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> onload = function() {
>     test0 = document.createElement('div');
>Index: LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html	(working copy)
>@@ -8,14 +8,14 @@ body { -webkit-column-width: 0; }
>     function clear() {
>         document.documentElement.removeChild(document.body);
>         document.documentElement.innerHTML='PASS, if no exception or crash';
>-        if (window.layoutTestController) {
>-            layoutTestController.notifyDone();
>+        if (window.testRunner) {
>+            testRunner.notifyDone();
>         }
>     }
>     setTimeout("clear();", 0);
>-    if (window.layoutTestController) {
>-        layoutTestController.waitUntilDone();
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.waitUntilDone();
>+        testRunner.dumpAsText();
>     }
> </script>
> <body>
>Index: LayoutTests/fast/multicol/span/runin-continuation-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/runin-continuation-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/runin-continuation-crash.html	(working copy)
>@@ -8,8 +8,8 @@
> .runin { display: run-in; }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> document.body.offsetTop;
> div1 = document.createElement('div');
>Index: LayoutTests/fast/multicol/span/split-flow-anonymous-wrapper-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/split-flow-anonymous-wrapper-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/split-flow-anonymous-wrapper-crash.html	(working copy)
>@@ -6,8 +6,8 @@ Test passes if it does crash.
> .d1 { -webkit-column-span: all; }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function runTest() {
> div1 = document.createElement('div');
>Index: LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html	(working copy)
>@@ -1,8 +1,8 @@
> <html>
> <head>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function runTest() {
>     var container = document.createElement('div');
>Index: LayoutTests/fast/multicol/span/table-multi-column-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/table-multi-column-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/table-multi-column-crash.html	(working copy)
>@@ -7,8 +7,8 @@ Test passes if it does not crash.
> .table_container { -webkit-column-count: 2; }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> document.body.offsetTop;
> table_span = document.createElement('table');
>Index: LayoutTests/fast/multicol/span/textbox-not-removed-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/textbox-not-removed-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/textbox-not-removed-crash.html	(working copy)
>@@ -12,8 +12,8 @@
> }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function crash() {
>     test1 = document.createElement('div'); 
>Index: LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html
>===================================================================
>--- LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html	(revision 122551)
>+++ LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html	(working copy)
>@@ -8,8 +8,8 @@
> #table { float: right; }
> </style>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> onload = function() {
>     columnContainer = document.createElement('div');
>Index: LayoutTests/fast/multicol/vertical-lr/break-properties.html
>===================================================================
>--- LayoutTests/fast/multicol/vertical-lr/break-properties.html	(revision 122551)
>+++ LayoutTests/fast/multicol/vertical-lr/break-properties.html	(working copy)
>@@ -14,8 +14,8 @@
> </div>
> <pre id="console"></pre>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(message)
>     {
>Index: LayoutTests/fast/multicol/vertical-lr/float-truncation.html
>===================================================================
>--- LayoutTests/fast/multicol/vertical-lr/float-truncation.html	(revision 122551)
>+++ LayoutTests/fast/multicol/vertical-lr/float-truncation.html	(working copy)
>@@ -94,8 +94,8 @@
>         }
>     }
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         document.getElementById("tests").style.display = "none";
>     }
> 
>Index: LayoutTests/fast/multicol/vertical-lr/gap-non-negative.html
>===================================================================
>--- LayoutTests/fast/multicol/vertical-lr/gap-non-negative.html	(revision 122551)
>+++ LayoutTests/fast/multicol/vertical-lr/gap-non-negative.html	(working copy)
>@@ -8,8 +8,8 @@
> <p id = "result"></p>
> <div id="target" style="-webkit-column-count: 4; -webkit-column-gap: -10px;"></div>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     var style = getComputedStyle(document.getElementById("target"));
>     var columnGap = style.getPropertyValue("-webkit-column-gap");
>Index: LayoutTests/fast/multicol/vertical-lr/image-inside-nested-blocks-with-border.html
>===================================================================
>--- LayoutTests/fast/multicol/vertical-lr/image-inside-nested-blocks-with-border.html	(revision 122551)
>+++ LayoutTests/fast/multicol/vertical-lr/image-inside-nested-blocks-with-border.html	(working copy)
>@@ -30,8 +30,8 @@
>             failures++
>     }
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         document.getElementById("tests").style.display = "none";
>     }
> 
>Index: LayoutTests/fast/multicol/vertical-rl/break-properties.html
>===================================================================
>--- LayoutTests/fast/multicol/vertical-rl/break-properties.html	(revision 122551)
>+++ LayoutTests/fast/multicol/vertical-rl/break-properties.html	(working copy)
>@@ -17,8 +17,8 @@
> </div>
> <pre id="console"></pre>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function log(message)
>     {
>Index: LayoutTests/fast/multicol/vertical-rl/float-truncation.html
>===================================================================
>--- LayoutTests/fast/multicol/vertical-rl/float-truncation.html	(revision 122551)
>+++ LayoutTests/fast/multicol/vertical-rl/float-truncation.html	(working copy)
>@@ -97,8 +97,8 @@
>         }
>     }
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         document.getElementById("tests").style.display = "none";
>     }
> 
>Index: LayoutTests/fast/multicol/vertical-rl/gap-non-negative.html
>===================================================================
>--- LayoutTests/fast/multicol/vertical-rl/gap-non-negative.html	(revision 122551)
>+++ LayoutTests/fast/multicol/vertical-rl/gap-non-negative.html	(working copy)
>@@ -8,8 +8,8 @@
> <p id = "result"></p>
> <div id="target" style="-webkit-column-count: 4; -webkit-column-gap: -10px;"></div>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     var style = getComputedStyle(document.getElementById("target"));
>     var columnGap = style.getPropertyValue("-webkit-column-gap");
>Index: LayoutTests/fast/multicol/vertical-rl/image-inside-nested-blocks-with-border.html
>===================================================================
>--- LayoutTests/fast/multicol/vertical-rl/image-inside-nested-blocks-with-border.html	(revision 122551)
>+++ LayoutTests/fast/multicol/vertical-rl/image-inside-nested-blocks-with-border.html	(working copy)
>@@ -32,8 +32,8 @@
>         }
>     }
> 
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>         document.getElementById("tests").style.display = "none";
>     }
> 
>Index: LayoutTests/fast/mutation/end-of-task-delivery.html
>===================================================================
>--- LayoutTests/fast/mutation/end-of-task-delivery.html	(revision 122551)
>+++ LayoutTests/fast/mutation/end-of-task-delivery.html	(working copy)
>@@ -4,9 +4,9 @@
> </ol>
> <p>Then click here</p>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
> 
>     var list = document.querySelector('ol');
>@@ -16,8 +16,8 @@
>     observer.observe(list, {childList: true});
>     list.addEventListener('blur', function() {
>         document.body.innerHTML = observerRuns == 1 ? 'PASSED' : 'FAILED';
>-        if (window.layoutTestController)
>-            layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>     });
>     list.focus();
>     if (window.eventSender) {
>Index: LayoutTests/fast/mutation/inline-event-listener.html
>===================================================================
>--- LayoutTests/fast/mutation/inline-event-listener.html	(revision 122551)
>+++ LayoutTests/fast/mutation/inline-event-listener.html	(working copy)
>@@ -1,11 +1,11 @@
> <!DOCTYPE html>
>-<ol contenteditable oninput="document.body.innerHTML = observerRan ? 'FAILED' : 'PASSED'; if (window.layoutTestController) layoutTestController.notifyDone()">
>+<ol contenteditable oninput="document.body.innerHTML = observerRan ? 'FAILED' : 'PASSED'; if (window.testRunner) testRunner.notifyDone()">
>     <li>Press enter
> </ol>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
> 
>     var list = document.querySelector('ol');
>Index: LayoutTests/fast/mutation/mutation-callback-non-element-crash.html
>===================================================================
>--- LayoutTests/fast/mutation/mutation-callback-non-element-crash.html	(revision 122551)
>+++ LayoutTests/fast/mutation/mutation-callback-non-element-crash.html	(working copy)
>@@ -2,8 +2,8 @@
> <html>
> <body>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function mutationCallback(mutations, observer) {
>     mutations[0].addedNodes[-1];
>Index: LayoutTests/platform/chromium/fast/loader/create-view-target-blank.html
>===================================================================
>--- LayoutTests/platform/chromium/fast/loader/create-view-target-blank.html	(revision 122551)
>+++ LayoutTests/platform/chromium/fast/loader/create-view-target-blank.html	(working copy)
>@@ -1,12 +1,12 @@
> <html>
> <head>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpCreateView();
>-    layoutTestController.setCanOpenWindows();
>-    layoutTestController.setCloseRemainingWindowsWhenComplete();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpCreateView();
>+    testRunner.setCanOpenWindows();
>+    testRunner.setCloseRemainingWindowsWhenComplete();
>+    testRunner.waitUntilDone();
> }
> 
> function runTest() {
>Index: LayoutTests/platform/chromium/fast/loader/resources/done.html
>===================================================================
>--- LayoutTests/platform/chromium/fast/loader/resources/done.html	(revision 122551)
>+++ LayoutTests/platform/chromium/fast/loader/resources/done.html	(working copy)
>@@ -1,4 +1,4 @@
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
> </script>
>Index: LayoutTests/platform/gtk/fast/loader/crash-display-local-directory.html
>===================================================================
>--- LayoutTests/platform/gtk/fast/loader/crash-display-local-directory.html	(revision 122551)
>+++ LayoutTests/platform/gtk/fast/loader/crash-display-local-directory.html	(working copy)
>@@ -3,8 +3,8 @@
>     <title>Test crash on directory display</title>
>     <script>
>         function directoryTest() {
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
> 
>             var result = document.getElementById("result");
> 
>Index: LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html
>===================================================================
>--- LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html	(revision 122551)
>+++ LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpResourceResponseMIMETypes();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpResourceResponseMIMETypes();
>+    testRunner.waitUntilDone();
> }
> 
> var testImage;
>@@ -152,8 +152,8 @@ function imageLoaded()
> 
> function finish()
> {
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3.html
>===================================================================
>--- LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3.html	(revision 122551)
>+++ LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpResourceResponseMIMETypes();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpResourceResponseMIMETypes();
>+    testRunner.waitUntilDone();
> }
> 
> var testImage;
>@@ -134,8 +134,8 @@ function imageLoaded()
> 
> function finish()
> {
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/platform/mac/fast/loader/file-url-mimetypes.html
>===================================================================
>--- LayoutTests/platform/mac/fast/loader/file-url-mimetypes.html	(revision 122551)
>+++ LayoutTests/platform/mac/fast/loader/file-url-mimetypes.html	(working copy)
>@@ -2,10 +2,10 @@
> <head>
> <script>
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.dumpResourceResponseMIMETypes();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.dumpResourceResponseMIMETypes();
>+    testRunner.waitUntilDone();
> }
> 
> var testImage;
>@@ -154,8 +154,8 @@ function imageLoaded()
> 
> function finish()
> {
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/platform/mac/fast/loader/non-html-load-event.html
>===================================================================
>--- LayoutTests/platform/mac/fast/loader/non-html-load-event.html	(revision 122551)
>+++ LayoutTests/platform/mac/fast/loader/non-html-load-event.html	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     function frameLoaded()
>     {
>Index: LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected.html
>===================================================================
>--- LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected.html	(revision 122551)
>+++ LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected.html	(working copy)
>@@ -1,7 +1,7 @@
> <script>
>-if (window.layoutTestController) {
>-	layoutTestController.dumpAsText();
>-	layoutTestController.dumpChildFramesAsText();
>+if (window.testRunner) {
>+	testRunner.dumpAsText();
>+	testRunner.dumpChildFramesAsText();
> }
> </script>
> The webarchive in this iframe is utf-8 encoded and will only display properly if the webarchive's encoding is respected.<br>
>Index: LayoutTests/platform/qt/fast/loader/user-stylesheet-qrc-path.html
>===================================================================
>--- LayoutTests/platform/qt/fast/loader/user-stylesheet-qrc-path.html	(revision 122551)
>+++ LayoutTests/platform/qt/fast/loader/user-stylesheet-qrc-path.html	(working copy)
>@@ -2,10 +2,10 @@
>     This tests that a qrc URL is properly loaded as a user style sheet.
> </p>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.setUserStyleSheetEnabled(true);
>-        layoutTestController.setUserStyleSheetLocation('qrc:///resources/user.css');
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.setUserStyleSheetEnabled(true);
>+        testRunner.setUserStyleSheetLocation('qrc:///resources/user.css');
>         
>         var computedStyle = getComputedStyle(document.body),
>             result = computedStyle.fontSize == '50px' && computedStyle.backgroundColor == 'rgb(255, 255, 0)',

Flags:

abarth: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 91315: 152415