Use testRunner instead of layoutTestController in ietestcenter, inspector, java, jquery, loader, mathml, media, and mhtml tests
https://bugs.webkit.org/show_bug.cgi?id=89176

Reviewed by Kent Tamura.

* ietestcenter/css3/bordersbackgrounds/background-attachment-local-scrolling.htm:
* inspector/audits/resources/audits-style1.css:
* inspector/console/console-long-eval-crash.html:
* inspector/extensions/extensions-audits-content-script.html:
* inspector/extensions/extensions-eval-content-script.html:
* inspector/profiler/cpu-profiler-profiling-without-inspector.html:
* inspector/timeline/timeline-animation-frame.html:
* inspector/timeline/timeline-paint.html:
* inspector/timeline/timeline-receive-response-event.html:
* inspector/timeline/timeline-timer.html:
* java/argument-to-object-type.html:
* java/array-return.html:
* java/array-sort.html:
* java/embedding-java-with-object.html:
* java/inaccessible-class.html:
* java/inline-applet-crash.html:
* java/java-and-plugins.html:
* java/lc3/:
* jquery/resources/helper.js:
* loader/go-back-to-different-window-size.html:
* loader/load-defer-resume-crash.html:
* loader/navigation-while-deferring-loads.html:
* loader/reload-subresource-when-type-changes.html:
* mathml/EmptyMFracCrash.xhtml:
* mathml/EmptyMunderOverCrash.xhtml:
* mathml/empty-mroot-crash.xhtml:
* mathml/empty-msubsup-crash.html:
* mathml/fenced-whitespace-separators-crash.html:
* mathml/msub-anonymous-child-render-crash.html:
* mathml/msubsup-no-grandchild.xhtml:
* mathml/msubsup-remove-children.xhtml:
* mathml/munderover-remove-children.html:
* mathml/operator-hijacks-fenced-node.xhtml:
* mathml/wbr-in-mroot-crash.html:
* media/W3C/w3cwrapper.js:
(test):
(async_test.t.done):
(async_test):
* media/adopt-node-crash.html:
* media/audio-controls-do-not-fade-out.html:
* media/audio-controls-rendering.html:
* media/audio-delete-while-slider-thumb-clicked.html:
* media/audio-delete-while-step-button-clicked.html:
* media/audio-garbage-collect.html:
* media/audio-no-installed-engines.html:
* media/audio-only-video-intrinsic-size.html:
* media/audio-repaint.html:
* media/context-menu-actions.html:
* media/controls-after-reload.html:
* media/controls-drag-timebar.html:
* media/controls-layout-direction.html:
* media/controls-right-click-on-timebar.html:
* media/controls-without-preload.html:
* media/crash-closing-page-with-media-as-plugin-fallback.html:
* media/fallback.html:
* media/media-blocked-by-beforeload.html:
* media/media-blocked-by-willsendrequest.html:
* media/media-controls-clone-crash.html:
* media/media-controls-invalid-url.html:
* media/media-document-audio-repaint.html:
* media/media-document-audio-size.html:
* media/media-fullscreen.js:
(canplaythrough):
* media/media-volume-slider-rendered-normal.html:
* media/no-auto-play-in-sandbox.html:
* media/remove-from-document-before-load.html:
* media/resources/foreignobject-media.svg:
* media/restore-from-page-cache.html:
* media/svg-as-image-with-media-blocked.html:
* media/video-beforeload-remove-source.html:
* media/video-canvas-alpha.html:
* media/video-canvas.html-disabled:
* media/video-click-dblckick-standalone.html:
* media/video-controls-in-media-document.html:
* media/video-controls-no-scripting.html:
* media/video-controls-toggling.html:
* media/video-controls-visible-audio-only.html:
* media/video-controls-with-mutation-event-handler.html:
* media/video-delay-load-event.html:
* media/video-display-toggle.html:
* media/video-document-types.html:
* media/video-element-other-namespace-crash.html:
* media/video-empty-source.html:
* media/video-no-audio.html:
* media/video-paint-test.js:
(init.waitForMultipleEvents):
(initAndPause.waitForMultipleEvents):
(initAndPause):
* media/video-plays-past-end-of-test.html:
* media/video-poster-blocked-by-willsendrequest.html:
* media/video-replaces-poster.html:
* media/video-source-inserted.html:
* media/video-test.js:
(endTest):
* media/video-volume-slider.html:
* media/video-zoom.html:
* mhtml/check_domain.mht:
* mhtml/multi_frames.html_original:
* mhtml/multi_frames_binary.mht:
* mhtml/multi_frames_ie.mht:
* mhtml/multi_frames_unmht.mht:
* mhtml/page_with_css_and_js_ie.mht:
* mhtml/page_with_css_and_js_unmht.mht:
* mhtml/page_with_image.html_original:
* mhtml/page_with_image_ie.mht:
* mhtml/page_with_image_unmht.mht:
* mhtml/simple_page.html_original:
* mhtml/simple_page_ie.mht:
* mhtml/simple_page_unmht.mht:
* networkinformation/resources/event-after-navigation-new.html:
* networkinformation/script-tests/event-after-navigation.js:
* platform/chromium/media/video-frame-size-change.html:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120416 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 332c729..777bc3a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,123 @@
+2012-06-15  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Use testRunner instead of layoutTestController in ietestcenter, inspector, java, jquery, loader, mathml, media, and mhtml tests
+        https://bugs.webkit.org/show_bug.cgi?id=89176
+
+        Reviewed by Kent Tamura.
+
+        * ietestcenter/css3/bordersbackgrounds/background-attachment-local-scrolling.htm:
+        * inspector/audits/resources/audits-style1.css:
+        * inspector/console/console-long-eval-crash.html:
+        * inspector/extensions/extensions-audits-content-script.html:
+        * inspector/extensions/extensions-eval-content-script.html:
+        * inspector/profiler/cpu-profiler-profiling-without-inspector.html:
+        * inspector/timeline/timeline-animation-frame.html:
+        * inspector/timeline/timeline-paint.html:
+        * inspector/timeline/timeline-receive-response-event.html:
+        * inspector/timeline/timeline-timer.html:
+        * java/argument-to-object-type.html:
+        * java/array-return.html:
+        * java/array-sort.html:
+        * java/embedding-java-with-object.html:
+        * java/inaccessible-class.html:
+        * java/inline-applet-crash.html:
+        * java/java-and-plugins.html:
+        * java/lc3/:
+        * jquery/resources/helper.js:
+        * loader/go-back-to-different-window-size.html:
+        * loader/load-defer-resume-crash.html:
+        * loader/navigation-while-deferring-loads.html:
+        * loader/reload-subresource-when-type-changes.html:
+        * mathml/EmptyMFracCrash.xhtml:
+        * mathml/EmptyMunderOverCrash.xhtml:
+        * mathml/empty-mroot-crash.xhtml:
+        * mathml/empty-msubsup-crash.html:
+        * mathml/fenced-whitespace-separators-crash.html:
+        * mathml/msub-anonymous-child-render-crash.html:
+        * mathml/msubsup-no-grandchild.xhtml:
+        * mathml/msubsup-remove-children.xhtml:
+        * mathml/munderover-remove-children.html:
+        * mathml/operator-hijacks-fenced-node.xhtml:
+        * mathml/wbr-in-mroot-crash.html:
+        * media/W3C/w3cwrapper.js:
+        (test):
+        (async_test.t.done):
+        (async_test):
+        * media/adopt-node-crash.html:
+        * media/audio-controls-do-not-fade-out.html:
+        * media/audio-controls-rendering.html:
+        * media/audio-delete-while-slider-thumb-clicked.html:
+        * media/audio-delete-while-step-button-clicked.html:
+        * media/audio-garbage-collect.html:
+        * media/audio-no-installed-engines.html:
+        * media/audio-only-video-intrinsic-size.html:
+        * media/audio-repaint.html:
+        * media/context-menu-actions.html:
+        * media/controls-after-reload.html:
+        * media/controls-drag-timebar.html:
+        * media/controls-layout-direction.html:
+        * media/controls-right-click-on-timebar.html:
+        * media/controls-without-preload.html:
+        * media/crash-closing-page-with-media-as-plugin-fallback.html:
+        * media/fallback.html:
+        * media/media-blocked-by-beforeload.html:
+        * media/media-blocked-by-willsendrequest.html:
+        * media/media-controls-clone-crash.html:
+        * media/media-controls-invalid-url.html:
+        * media/media-document-audio-repaint.html:
+        * media/media-document-audio-size.html:
+        * media/media-fullscreen.js:
+        (canplaythrough):
+        * media/media-volume-slider-rendered-normal.html:
+        * media/no-auto-play-in-sandbox.html:
+        * media/remove-from-document-before-load.html:
+        * media/resources/foreignobject-media.svg:
+        * media/restore-from-page-cache.html:
+        * media/svg-as-image-with-media-blocked.html:
+        * media/video-beforeload-remove-source.html:
+        * media/video-canvas-alpha.html:
+        * media/video-canvas.html-disabled:
+        * media/video-click-dblckick-standalone.html:
+        * media/video-controls-in-media-document.html:
+        * media/video-controls-no-scripting.html:
+        * media/video-controls-toggling.html:
+        * media/video-controls-visible-audio-only.html:
+        * media/video-controls-with-mutation-event-handler.html:
+        * media/video-delay-load-event.html:
+        * media/video-display-toggle.html:
+        * media/video-document-types.html:
+        * media/video-element-other-namespace-crash.html:
+        * media/video-empty-source.html:
+        * media/video-no-audio.html:
+        * media/video-paint-test.js:
+        (init.waitForMultipleEvents):
+        (initAndPause.waitForMultipleEvents):
+        (initAndPause):
+        * media/video-plays-past-end-of-test.html:
+        * media/video-poster-blocked-by-willsendrequest.html:
+        * media/video-replaces-poster.html:
+        * media/video-source-inserted.html:
+        * media/video-test.js:
+        (endTest):
+        * media/video-volume-slider.html:
+        * media/video-zoom.html:
+        * mhtml/check_domain.mht:
+        * mhtml/multi_frames.html_original:
+        * mhtml/multi_frames_binary.mht:
+        * mhtml/multi_frames_ie.mht:
+        * mhtml/multi_frames_unmht.mht:
+        * mhtml/page_with_css_and_js_ie.mht:
+        * mhtml/page_with_css_and_js_unmht.mht:
+        * mhtml/page_with_image.html_original:
+        * mhtml/page_with_image_ie.mht:
+        * mhtml/page_with_image_unmht.mht:
+        * mhtml/simple_page.html_original:
+        * mhtml/simple_page_ie.mht:
+        * mhtml/simple_page_unmht.mht:
+        * networkinformation/resources/event-after-navigation-new.html:
+        * networkinformation/script-tests/event-after-navigation.js:
+        * platform/chromium/media/video-frame-size-change.html:
+
 2012-06-15  Emil A Eklund  <eae@chromium.org>
 
         Unreviewed chromium win and mac rebaseline for r120403.
diff --git a/LayoutTests/ietestcenter/css3/bordersbackgrounds/background-attachment-local-scrolling.htm b/LayoutTests/ietestcenter/css3/bordersbackgrounds/background-attachment-local-scrolling.htm
index b7458b3..be02c1c 100644
--- a/LayoutTests/ietestcenter/css3/bordersbackgrounds/background-attachment-local-scrolling.htm
+++ b/LayoutTests/ietestcenter/css3/bordersbackgrounds/background-attachment-local-scrolling.htm
@@ -47,9 +47,9 @@
     </head>
     <body>
         <script>
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 // Unfortunately, this needs to be a pixel test
-                window.layoutTestController.waitUntilDone();
+                window.testRunner.waitUntilDone();
             }
         </script>
 
@@ -83,7 +83,7 @@
 
         function finished()
         {
-            window.layoutTestController.notifyDone();
+            window.testRunner.notifyDone();
         }
 
     </script>
diff --git a/LayoutTests/inspector/console/console-long-eval-crash.html b/LayoutTests/inspector/console/console-long-eval-crash.html
index 75444bb..87b4fac 100644
--- a/LayoutTests/inspector/console/console-long-eval-crash.html
+++ b/LayoutTests/inspector/console/console-long-eval-crash.html
@@ -4,13 +4,13 @@
 <script src="../../http/tests/inspector/console-test.js"></script>
 <script>
 
-layoutTestController.setCanOpenWindows();
+testRunner.setCanOpenWindows();
 
 function doDialog()
 {
-    layoutTestController.closeWebInspector();
+    testRunner.closeWebInspector();
     showModalDialog('data:text/html,<script>setTimeout(close, 0);%3c/script>');
-    setTimeout(function(){layoutTestController.notifyDone();}, 0);
+    setTimeout(function(){testRunner.notifyDone();}, 0);
 }
 
 function test()
diff --git a/LayoutTests/inspector/extensions/extensions-audits-content-script.html b/LayoutTests/inspector/extensions/extensions-audits-content-script.html
index ca78116..0a5c42e 100644
--- a/LayoutTests/inspector/extensions/extensions-audits-content-script.html
+++ b/LayoutTests/inspector/extensions/extensions-audits-content-script.html
@@ -9,8 +9,8 @@
 
 window.whereAmI = "main world";
 
-layoutTestController.setIsolatedWorldSecurityOrigin(632, "file:///");
-layoutTestController.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
+testRunner.setIsolatedWorldSecurityOrigin(632, "file:///");
+testRunner.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
 
 function extension_testAudits(nextTest)
 {
diff --git a/LayoutTests/inspector/extensions/extensions-eval-content-script.html b/LayoutTests/inspector/extensions/extensions-eval-content-script.html
index 375618a..ac0404f 100644
--- a/LayoutTests/inspector/extensions/extensions-eval-content-script.html
+++ b/LayoutTests/inspector/extensions/extensions-eval-content-script.html
@@ -6,8 +6,8 @@
 
 window.whereAmI = "main world";
 
-layoutTestController.setIsolatedWorldSecurityOrigin(632, "file:///");
-layoutTestController.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
+testRunner.setIsolatedWorldSecurityOrigin(632, "file:///");
+testRunner.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
 
 function extension_testEvalInMainWorldImplicit(nextTest)
 {
diff --git a/LayoutTests/inspector/profiler/cpu-profiler-profiling-without-inspector.html b/LayoutTests/inspector/profiler/cpu-profiler-profiling-without-inspector.html
index d0b8856..5a40c05 100644
--- a/LayoutTests/inspector/profiler/cpu-profiler-profiling-without-inspector.html
+++ b/LayoutTests/inspector/profiler/cpu-profiler-profiling-without-inspector.html
@@ -2,8 +2,8 @@
 <head>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 if (window.internals)
     internals.settings.setJavaScriptProfilingEnabled(true);
 
@@ -19,8 +19,8 @@
 {
     pageFunction();
     printResult();
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function printResult()
diff --git a/LayoutTests/inspector/timeline/timeline-animation-frame.html b/LayoutTests/inspector/timeline/timeline-animation-frame.html
index b164443..657c36a 100644
--- a/LayoutTests/inspector/timeline/timeline-animation-frame.html
+++ b/LayoutTests/inspector/timeline/timeline-animation-frame.html
@@ -13,8 +13,8 @@
         window.webkitCancelRequestAnimationFrame(requestId);
     }
 
-    if (window.layoutTestController)
-        layoutTestController.display();
+    if (window.testRunner)
+        testRunner.display();
 }
 
 function test()
@@ -34,7 +34,7 @@
     }
 }
 
-if (!window.layoutTestController)
+if (!window.testRunner)
     setTimeout(performActions, 2000);
 
 </script>
diff --git a/LayoutTests/inspector/timeline/timeline-paint.html b/LayoutTests/inspector/timeline/timeline-paint.html
index 2ef2132..b54c228 100644
--- a/LayoutTests/inspector/timeline/timeline-paint.html
+++ b/LayoutTests/inspector/timeline/timeline-paint.html
@@ -6,8 +6,8 @@
 
 function performActions()
 {
-    if (window.layoutTestController)
-        layoutTestController.display();
+    if (window.testRunner)
+        testRunner.display();
 }
 
 function test()
diff --git a/LayoutTests/inspector/timeline/timeline-receive-response-event.html b/LayoutTests/inspector/timeline/timeline-receive-response-event.html
index 5614c0e..a44b8c5 100644
--- a/LayoutTests/inspector/timeline/timeline-receive-response-event.html
+++ b/LayoutTests/inspector/timeline/timeline-receive-response-event.html
@@ -12,7 +12,7 @@
 
     function bar() {
         var image = new Image();
-        image.onload = function() { layoutTestController.evaluateInWebInspector(0, "window.step2()"); }
+        image.onload = function() { testRunner.evaluateInWebInspector(0, "window.step2()"); }
         image.src = "resources/anotherImage.png";
     }
 }
@@ -55,7 +55,7 @@
     }
 }
 
-if (!window.layoutTestController)
+if (!window.testRunner)
     setTimeout(performActions, 3000);
 
 </script>
diff --git a/LayoutTests/inspector/timeline/timeline-timer.html b/LayoutTests/inspector/timeline/timeline-timer.html
index d149a7e..3c38c68 100644
--- a/LayoutTests/inspector/timeline/timeline-timer.html
+++ b/LayoutTests/inspector/timeline/timeline-timer.html
@@ -37,7 +37,7 @@
     }
 }
 
-if (!window.layoutTestController)
+if (!window.testRunner)
     setTimeout(performActions, 2000);
 
 </script>
diff --git a/LayoutTests/java/argument-to-object-type.html b/LayoutTests/java/argument-to-object-type.html
index d3bda2c..a5912c7 100644
--- a/LayoutTests/java/argument-to-object-type.html
+++ b/LayoutTests/java/argument-to-object-type.html
@@ -3,8 +3,8 @@
 <meta charset="utf-8">
 <script src="../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
+if (window.testRunner)
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
 </script>
 </head>
 <body>
diff --git a/LayoutTests/java/array-return.html b/LayoutTests/java/array-return.html
index 96781a48..d99d74d 100644
--- a/LayoutTests/java/array-return.html
+++ b/LayoutTests/java/array-return.html
@@ -3,8 +3,8 @@
 <meta charset="utf-8">
 <script src="../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
+if (window.testRunner)
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
 </script>
 </head>
 <body>
diff --git a/LayoutTests/java/array-sort.html b/LayoutTests/java/array-sort.html
index 02b66e6..1bfbde2 100644
--- a/LayoutTests/java/array-sort.html
+++ b/LayoutTests/java/array-sort.html
@@ -3,8 +3,8 @@
 <meta charset="utf-8">
 <script src="../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
+if (window.testRunner)
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
 </script>
 </head>
 <body>
diff --git a/LayoutTests/java/embedding-java-with-object.html b/LayoutTests/java/embedding-java-with-object.html
index eafb86b..00465ce 100644
--- a/LayoutTests/java/embedding-java-with-object.html
+++ b/LayoutTests/java/embedding-java-with-object.html
@@ -3,8 +3,8 @@
 <meta charset="utf-8">
 <script src="../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
+if (window.testRunner)
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
 </script>
 </head>
 <body>
diff --git a/LayoutTests/java/inaccessible-class.html b/LayoutTests/java/inaccessible-class.html
index b1f6b51..9420166 100644
--- a/LayoutTests/java/inaccessible-class.html
+++ b/LayoutTests/java/inaccessible-class.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
 }
 </script>
 </head>
@@ -27,7 +27,7 @@
     else
         log("FAIL: result is " + result);
 } catch (ex) {
-    if (window.layoutTestController)
+    if (window.testRunner)
         log("FAIL: Exception raised");
     else
         log(ex);
diff --git a/LayoutTests/java/inline-applet-crash.html b/LayoutTests/java/inline-applet-crash.html
index 485668b..4b8c4b3 100755
--- a/LayoutTests/java/inline-applet-crash.html
+++ b/LayoutTests/java/inline-applet-crash.html
@@ -3,10 +3,10 @@
 Test passes if it does not crash.

 <applet code=doesnotexist.class></applet>

 <script>

-if (window.layoutTestController) {

-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");

-    layoutTestController.dumpAsText();

-    layoutTestController.waitUntilDone();

+if (window.testRunner) {

+    testRunner.overridePreference("WebKitJavaEnabled", "1");

+    testRunner.dumpAsText();

+    testRunner.waitUntilDone();

 }

 

 function walk(arr, currentPrefix, index, domNode) {

@@ -21,8 +21,8 @@
 function crash() {

     var temp = new Array();

     walk(temp, "", 0, document.documentElement);

-    if (window.layoutTestController)

-        layoutTestController.notifyDone();

+    if (window.testRunner)

+        testRunner.notifyDone();

 }

  

 setTimeout("crash();", 0);

diff --git a/LayoutTests/java/java-and-plugins.html b/LayoutTests/java/java-and-plugins.html
index 3bcfd8b..bab9412 100644
--- a/LayoutTests/java/java-and-plugins.html
+++ b/LayoutTests/java/java-and-plugins.html
@@ -3,8 +3,8 @@
 <meta charset="utf-8">
 <script src="../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController)
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
+if (window.testRunner)
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
 </script>
 </head>
 <body>
diff --git a/LayoutTests/java/lc3/ArrayMethods/byte-001.html b/LayoutTests/java/lc3/ArrayMethods/byte-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ArrayMethods/byte-001.html
+++ b/LayoutTests/java/lc3/ArrayMethods/byte-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ArrayMethods/byte-002.html b/LayoutTests/java/lc3/ArrayMethods/byte-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ArrayMethods/byte-002.html
+++ b/LayoutTests/java/lc3/ArrayMethods/byte-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ArrayMethods/object-001.html-disabled b/LayoutTests/java/lc3/ArrayMethods/object-001.html-disabled
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ArrayMethods/object-001.html-disabled
+++ b/LayoutTests/java/lc3/ArrayMethods/object-001.html-disabled
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/CallStatic/boolean-001.html b/LayoutTests/java/lc3/CallStatic/boolean-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/CallStatic/boolean-001.html
+++ b/LayoutTests/java/lc3/CallStatic/boolean-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/CallStatic/number-001.html b/LayoutTests/java/lc3/CallStatic/number-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/CallStatic/number-001.html
+++ b/LayoutTests/java/lc3/CallStatic/number-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/CallStatic/object-001.html b/LayoutTests/java/lc3/CallStatic/object-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/CallStatic/object-001.html
+++ b/LayoutTests/java/lc3/CallStatic/object-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/Constructors/construct-001.html b/LayoutTests/java/lc3/Constructors/construct-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/Constructors/construct-001.html
+++ b/LayoutTests/java/lc3/Constructors/construct-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-001.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-001.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-002.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-002.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-003.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-003.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-003.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-003.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-004.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-004.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-004.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-004.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-005-n.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-005-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-005-n.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-005-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-006-n.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-006-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-006-n.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-006-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-007-n.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-007-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-007-n.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-007-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-008-n.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-008-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-008-n.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-008-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-009-n.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-009-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-009-n.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-009-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-010-n.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-010-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-010-n.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-010-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-011-n.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-011-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-011-n.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-011-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-012-n.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-012-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-012-n.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-012-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-013-n.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-013-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-013-n.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-013-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertBoolean/boolean-014.html b/LayoutTests/java/lc3/ConvertBoolean/boolean-014.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertBoolean/boolean-014.html
+++ b/LayoutTests/java/lc3/ConvertBoolean/boolean-014.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToBoolean-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToBoolean-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToBoolean-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToBoolean-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToByte-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToByte-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToByte-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToByte-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToByte-002.html b/LayoutTests/java/lc3/ConvertJSObject/ToByte-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToByte-002.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToByte-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToChar-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToChar-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToChar-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToChar-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToChar-002.html b/LayoutTests/java/lc3/ConvertJSObject/ToChar-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToChar-002.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToChar-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToDouble-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToDouble-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToDouble-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToDouble-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToFloat-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToFloat-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToFloat-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToFloat-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToInt-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToInt-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToInt-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToInt-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToInt-002.html b/LayoutTests/java/lc3/ConvertJSObject/ToInt-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToInt-002.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToInt-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToJSObject-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToJSObject-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToJSObject-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToJSObject-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToLong-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToLong-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToLong-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToLong-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToLong-002.html b/LayoutTests/java/lc3/ConvertJSObject/ToLong-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToLong-002.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToLong-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToObject-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToObject-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToObject-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToObject-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToShort-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToShort-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToShort-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToShort-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToShort-002.html b/LayoutTests/java/lc3/ConvertJSObject/ToShort-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToShort-002.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToShort-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertJSObject/ToString-001.html b/LayoutTests/java/lc3/ConvertJSObject/ToString-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertJSObject/ToString-001.html
+++ b/LayoutTests/java/lc3/ConvertJSObject/ToString-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNull/null-001.html b/LayoutTests/java/lc3/ConvertNull/null-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNull/null-001.html
+++ b/LayoutTests/java/lc3/ConvertNull/null-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNull/null-002.html b/LayoutTests/java/lc3/ConvertNull/null-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNull/null-002.html
+++ b/LayoutTests/java/lc3/ConvertNull/null-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNull/null-003-n.html b/LayoutTests/java/lc3/ConvertNull/null-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNull/null-003-n.html
+++ b/LayoutTests/java/lc3/ConvertNull/null-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNull/null-004-n.html b/LayoutTests/java/lc3/ConvertNull/null-004-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNull/null-004-n.html
+++ b/LayoutTests/java/lc3/ConvertNull/null-004-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNull/null-005.html b/LayoutTests/java/lc3/ConvertNull/null-005.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNull/null-005.html
+++ b/LayoutTests/java/lc3/ConvertNull/null-005.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNull/null-006-n.html b/LayoutTests/java/lc3/ConvertNull/null-006-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNull/null-006-n.html
+++ b/LayoutTests/java/lc3/ConvertNull/null-006-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-001.html b/LayoutTests/java/lc3/ConvertNumber/number-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-001.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-002.html b/LayoutTests/java/lc3/ConvertNumber/number-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-002.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-003.html b/LayoutTests/java/lc3/ConvertNumber/number-003.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-003.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-003.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-004.html b/LayoutTests/java/lc3/ConvertNumber/number-004.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-004.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-004.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-005.html b/LayoutTests/java/lc3/ConvertNumber/number-005.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-005.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-005.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-006.html b/LayoutTests/java/lc3/ConvertNumber/number-006.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-006.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-006.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-007.html b/LayoutTests/java/lc3/ConvertNumber/number-007.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-007.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-007.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-008.html b/LayoutTests/java/lc3/ConvertNumber/number-008.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-008.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-008.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-009.html b/LayoutTests/java/lc3/ConvertNumber/number-009.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-009.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-009.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-010.html b/LayoutTests/java/lc3/ConvertNumber/number-010.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-010.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-010.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertNumber/number-011.html b/LayoutTests/java/lc3/ConvertNumber/number-011.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertNumber/number-011.html
+++ b/LayoutTests/java/lc3/ConvertNumber/number-011.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertString/string-001.html b/LayoutTests/java/lc3/ConvertString/string-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertString/string-001.html
+++ b/LayoutTests/java/lc3/ConvertString/string-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertString/string-002.html b/LayoutTests/java/lc3/ConvertString/string-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertString/string-002.html
+++ b/LayoutTests/java/lc3/ConvertString/string-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertString/string-003.html b/LayoutTests/java/lc3/ConvertString/string-003.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertString/string-003.html
+++ b/LayoutTests/java/lc3/ConvertString/string-003.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertString/string-004-n.html b/LayoutTests/java/lc3/ConvertString/string-004-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertString/string-004-n.html
+++ b/LayoutTests/java/lc3/ConvertString/string-004-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertString/string-005-n.html b/LayoutTests/java/lc3/ConvertString/string-005-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertString/string-005-n.html
+++ b/LayoutTests/java/lc3/ConvertString/string-005-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertString/string-006.html b/LayoutTests/java/lc3/ConvertString/string-006.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertString/string-006.html
+++ b/LayoutTests/java/lc3/ConvertString/string-006.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertString/string-007-n.html b/LayoutTests/java/lc3/ConvertString/string-007-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertString/string-007-n.html
+++ b/LayoutTests/java/lc3/ConvertString/string-007-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertUndefined/undefined-001-n.html b/LayoutTests/java/lc3/ConvertUndefined/undefined-001-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertUndefined/undefined-001-n.html
+++ b/LayoutTests/java/lc3/ConvertUndefined/undefined-001-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertUndefined/undefined-002.html b/LayoutTests/java/lc3/ConvertUndefined/undefined-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertUndefined/undefined-002.html
+++ b/LayoutTests/java/lc3/ConvertUndefined/undefined-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/ConvertUndefined/undefined-003.html b/LayoutTests/java/lc3/ConvertUndefined/undefined-003.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/ConvertUndefined/undefined-003.html
+++ b/LayoutTests/java/lc3/ConvertUndefined/undefined-003.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/Exceptions/throw_js_types.html b/LayoutTests/java/lc3/Exceptions/throw_js_types.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/Exceptions/throw_js_types.html
+++ b/LayoutTests/java/lc3/Exceptions/throw_js_types.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSBoolean/boolean-001.html b/LayoutTests/java/lc3/JSBoolean/boolean-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSBoolean/boolean-001.html
+++ b/LayoutTests/java/lc3/JSBoolean/boolean-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSBoolean/boolean-002-n.html b/LayoutTests/java/lc3/JSBoolean/boolean-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSBoolean/boolean-002-n.html
+++ b/LayoutTests/java/lc3/JSBoolean/boolean-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSBoolean/boolean-003-n.html b/LayoutTests/java/lc3/JSBoolean/boolean-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSBoolean/boolean-003-n.html
+++ b/LayoutTests/java/lc3/JSBoolean/boolean-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSBoolean/boolean-004-n.html b/LayoutTests/java/lc3/JSBoolean/boolean-004-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSBoolean/boolean-004-n.html
+++ b/LayoutTests/java/lc3/JSBoolean/boolean-004-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSBoolean/boolean-005-n.html b/LayoutTests/java/lc3/JSBoolean/boolean-005-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSBoolean/boolean-005-n.html
+++ b/LayoutTests/java/lc3/JSBoolean/boolean-005-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSBoolean/boolean-006-n.html b/LayoutTests/java/lc3/JSBoolean/boolean-006-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSBoolean/boolean-006-n.html
+++ b/LayoutTests/java/lc3/JSBoolean/boolean-006-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSBoolean/boolean-007-n.html b/LayoutTests/java/lc3/JSBoolean/boolean-007-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSBoolean/boolean-007-n.html
+++ b/LayoutTests/java/lc3/JSBoolean/boolean-007-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSBoolean/boolean-008-n.html b/LayoutTests/java/lc3/JSBoolean/boolean-008-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSBoolean/boolean-008-n.html
+++ b/LayoutTests/java/lc3/JSBoolean/boolean-008-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNull/ToBoolean-001-n.html b/LayoutTests/java/lc3/JSNull/ToBoolean-001-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNull/ToBoolean-001-n.html
+++ b/LayoutTests/java/lc3/JSNull/ToBoolean-001-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNull/ToFloat-001-n.html b/LayoutTests/java/lc3/JSNull/ToFloat-001-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNull/ToFloat-001-n.html
+++ b/LayoutTests/java/lc3/JSNull/ToFloat-001-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNull/ToLong-001-n.html b/LayoutTests/java/lc3/JSNull/ToLong-001-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNull/ToLong-001-n.html
+++ b/LayoutTests/java/lc3/JSNull/ToLong-001-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNull/ToNumber-001-n.html b/LayoutTests/java/lc3/JSNull/ToNumber-001-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNull/ToNumber-001-n.html
+++ b/LayoutTests/java/lc3/JSNull/ToNumber-001-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNull/ToObject-001.html b/LayoutTests/java/lc3/JSNull/ToObject-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNull/ToObject-001.html
+++ b/LayoutTests/java/lc3/JSNull/ToObject-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToByte-001.html b/LayoutTests/java/lc3/JSNumber/ToByte-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToByte-001.html
+++ b/LayoutTests/java/lc3/JSNumber/ToByte-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToByte-002-n.html b/LayoutTests/java/lc3/JSNumber/ToByte-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToByte-002-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToByte-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToByte-003-n.html b/LayoutTests/java/lc3/JSNumber/ToByte-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToByte-003-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToByte-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToByte-004.html b/LayoutTests/java/lc3/JSNumber/ToByte-004.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToByte-004.html
+++ b/LayoutTests/java/lc3/JSNumber/ToByte-004.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToByte-005-n.html b/LayoutTests/java/lc3/JSNumber/ToByte-005-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToByte-005-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToByte-005-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToChar-001.html b/LayoutTests/java/lc3/JSNumber/ToChar-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToChar-001.html
+++ b/LayoutTests/java/lc3/JSNumber/ToChar-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToChar-002-n.html b/LayoutTests/java/lc3/JSNumber/ToChar-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToChar-002-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToChar-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToChar-003-n.html b/LayoutTests/java/lc3/JSNumber/ToChar-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToChar-003-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToChar-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToChar-004.html b/LayoutTests/java/lc3/JSNumber/ToChar-004.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToChar-004.html
+++ b/LayoutTests/java/lc3/JSNumber/ToChar-004.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToChar-005-n.html b/LayoutTests/java/lc3/JSNumber/ToChar-005-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToChar-005-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToChar-005-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToChar-006-n.html b/LayoutTests/java/lc3/JSNumber/ToChar-006-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToChar-006-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToChar-006-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToDouble-001.html b/LayoutTests/java/lc3/JSNumber/ToDouble-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToDouble-001.html
+++ b/LayoutTests/java/lc3/JSNumber/ToDouble-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToDouble-002.html b/LayoutTests/java/lc3/JSNumber/ToDouble-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToDouble-002.html
+++ b/LayoutTests/java/lc3/JSNumber/ToDouble-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToDouble-003.html b/LayoutTests/java/lc3/JSNumber/ToDouble-003.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToDouble-003.html
+++ b/LayoutTests/java/lc3/JSNumber/ToDouble-003.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToInt-001.html b/LayoutTests/java/lc3/JSNumber/ToInt-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToInt-001.html
+++ b/LayoutTests/java/lc3/JSNumber/ToInt-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToInt-002-n.html b/LayoutTests/java/lc3/JSNumber/ToInt-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToInt-002-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToInt-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToInt-003-n.html b/LayoutTests/java/lc3/JSNumber/ToInt-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToInt-003-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToInt-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToInt-004.html b/LayoutTests/java/lc3/JSNumber/ToInt-004.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToInt-004.html
+++ b/LayoutTests/java/lc3/JSNumber/ToInt-004.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToInt-005-n.html b/LayoutTests/java/lc3/JSNumber/ToInt-005-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToInt-005-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToInt-005-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-001.html b/LayoutTests/java/lc3/JSNumber/ToLong-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-001.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-002-n.html b/LayoutTests/java/lc3/JSNumber/ToLong-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-002-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-003-n.html b/LayoutTests/java/lc3/JSNumber/ToLong-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-003-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-004-n.html b/LayoutTests/java/lc3/JSNumber/ToLong-004-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-004-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-004-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-005-n.html b/LayoutTests/java/lc3/JSNumber/ToLong-005-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-005-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-005-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-006-n.html b/LayoutTests/java/lc3/JSNumber/ToLong-006-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-006-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-006-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-007-n.html b/LayoutTests/java/lc3/JSNumber/ToLong-007-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-007-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-007-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-008-n.html b/LayoutTests/java/lc3/JSNumber/ToLong-008-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-008-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-008-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-009-n.html b/LayoutTests/java/lc3/JSNumber/ToLong-009-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-009-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-009-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-010-n.html b/LayoutTests/java/lc3/JSNumber/ToLong-010-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-010-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-010-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToLong-011-n.html b/LayoutTests/java/lc3/JSNumber/ToLong-011-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToLong-011-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToLong-011-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToShort-001.html b/LayoutTests/java/lc3/JSNumber/ToShort-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToShort-001.html
+++ b/LayoutTests/java/lc3/JSNumber/ToShort-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToShort-002-n.html b/LayoutTests/java/lc3/JSNumber/ToShort-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToShort-002-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToShort-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToShort-003-n.html b/LayoutTests/java/lc3/JSNumber/ToShort-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToShort-003-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToShort-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToShort-004.html b/LayoutTests/java/lc3/JSNumber/ToShort-004.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToShort-004.html
+++ b/LayoutTests/java/lc3/JSNumber/ToShort-004.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSNumber/ToShort-005-n.html b/LayoutTests/java/lc3/JSNumber/ToShort-005-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSNumber/ToShort-005-n.html
+++ b/LayoutTests/java/lc3/JSNumber/ToShort-005-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToByte-001.html b/LayoutTests/java/lc3/JSObject/ToByte-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToByte-001.html
+++ b/LayoutTests/java/lc3/JSObject/ToByte-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToChar-001.html b/LayoutTests/java/lc3/JSObject/ToChar-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToChar-001.html
+++ b/LayoutTests/java/lc3/JSObject/ToChar-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToDouble-001.html b/LayoutTests/java/lc3/JSObject/ToDouble-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToDouble-001.html
+++ b/LayoutTests/java/lc3/JSObject/ToDouble-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToDouble-002-n.html b/LayoutTests/java/lc3/JSObject/ToDouble-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToDouble-002-n.html
+++ b/LayoutTests/java/lc3/JSObject/ToDouble-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToDouble-003-n.html b/LayoutTests/java/lc3/JSObject/ToDouble-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToDouble-003-n.html
+++ b/LayoutTests/java/lc3/JSObject/ToDouble-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToFloat-001.html b/LayoutTests/java/lc3/JSObject/ToFloat-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToFloat-001.html
+++ b/LayoutTests/java/lc3/JSObject/ToFloat-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToFloat-002-n.html b/LayoutTests/java/lc3/JSObject/ToFloat-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToFloat-002-n.html
+++ b/LayoutTests/java/lc3/JSObject/ToFloat-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToFloat-003-n.html b/LayoutTests/java/lc3/JSObject/ToFloat-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToFloat-003-n.html
+++ b/LayoutTests/java/lc3/JSObject/ToFloat-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToInt-001.html b/LayoutTests/java/lc3/JSObject/ToInt-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToInt-001.html
+++ b/LayoutTests/java/lc3/JSObject/ToInt-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToInt-002.html b/LayoutTests/java/lc3/JSObject/ToInt-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToInt-002.html
+++ b/LayoutTests/java/lc3/JSObject/ToInt-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToJSObject-001.html b/LayoutTests/java/lc3/JSObject/ToJSObject-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToJSObject-001.html
+++ b/LayoutTests/java/lc3/JSObject/ToJSObject-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToLong-001.html b/LayoutTests/java/lc3/JSObject/ToLong-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToLong-001.html
+++ b/LayoutTests/java/lc3/JSObject/ToLong-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToObject-001.html b/LayoutTests/java/lc3/JSObject/ToObject-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToObject-001.html
+++ b/LayoutTests/java/lc3/JSObject/ToObject-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToShort-001.html b/LayoutTests/java/lc3/JSObject/ToShort-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToShort-001.html
+++ b/LayoutTests/java/lc3/JSObject/ToShort-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSObject/ToString-001.html b/LayoutTests/java/lc3/JSObject/ToString-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSObject/ToString-001.html
+++ b/LayoutTests/java/lc3/JSObject/ToString-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSUndefined/undefined-001.html b/LayoutTests/java/lc3/JSUndefined/undefined-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSUndefined/undefined-001.html
+++ b/LayoutTests/java/lc3/JSUndefined/undefined-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSUndefined/undefined-002-n.html b/LayoutTests/java/lc3/JSUndefined/undefined-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSUndefined/undefined-002-n.html
+++ b/LayoutTests/java/lc3/JSUndefined/undefined-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSUndefined/undefined-003-n.html b/LayoutTests/java/lc3/JSUndefined/undefined-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSUndefined/undefined-003-n.html
+++ b/LayoutTests/java/lc3/JSUndefined/undefined-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSUndefined/undefined-004-n.html b/LayoutTests/java/lc3/JSUndefined/undefined-004-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSUndefined/undefined-004-n.html
+++ b/LayoutTests/java/lc3/JSUndefined/undefined-004-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSUndefined/undefined-005-n.html b/LayoutTests/java/lc3/JSUndefined/undefined-005-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSUndefined/undefined-005-n.html
+++ b/LayoutTests/java/lc3/JSUndefined/undefined-005-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSUndefined/undefined-006-n.html b/LayoutTests/java/lc3/JSUndefined/undefined-006-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSUndefined/undefined-006-n.html
+++ b/LayoutTests/java/lc3/JSUndefined/undefined-006-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSUndefined/undefined-007-n.html b/LayoutTests/java/lc3/JSUndefined/undefined-007-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSUndefined/undefined-007-n.html
+++ b/LayoutTests/java/lc3/JSUndefined/undefined-007-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSUndefined/undefined-008-n.html b/LayoutTests/java/lc3/JSUndefined/undefined-008-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSUndefined/undefined-008-n.html
+++ b/LayoutTests/java/lc3/JSUndefined/undefined-008-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSUndefined/undefined-009-n.html b/LayoutTests/java/lc3/JSUndefined/undefined-009-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSUndefined/undefined-009-n.html
+++ b/LayoutTests/java/lc3/JSUndefined/undefined-009-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JSUndefined/undefined-010-n.html b/LayoutTests/java/lc3/JSUndefined/undefined-010-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JSUndefined/undefined-010-n.html
+++ b/LayoutTests/java/lc3/JSUndefined/undefined-010-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaArray/ToArray-001.html b/LayoutTests/java/lc3/JavaArray/ToArray-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaArray/ToArray-001.html
+++ b/LayoutTests/java/lc3/JavaArray/ToArray-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaArray/ToArray-002-n.html b/LayoutTests/java/lc3/JavaArray/ToArray-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaArray/ToArray-002-n.html
+++ b/LayoutTests/java/lc3/JavaArray/ToArray-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaArray/ToBoolean-001-n.html b/LayoutTests/java/lc3/JavaArray/ToBoolean-001-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaArray/ToBoolean-001-n.html
+++ b/LayoutTests/java/lc3/JavaArray/ToBoolean-001-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaArray/ToString-001.html b/LayoutTests/java/lc3/JavaArray/ToString-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaArray/ToString-001.html
+++ b/LayoutTests/java/lc3/JavaArray/ToString-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaClass/ToClass-001.html b/LayoutTests/java/lc3/JavaClass/ToClass-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaClass/ToClass-001.html
+++ b/LayoutTests/java/lc3/JavaClass/ToClass-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaClass/ToJSObject-001.html b/LayoutTests/java/lc3/JavaClass/ToJSObject-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaClass/ToJSObject-001.html
+++ b/LayoutTests/java/lc3/JavaClass/ToJSObject-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaClass/ToObject-001.html b/LayoutTests/java/lc3/JavaClass/ToObject-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaClass/ToObject-001.html
+++ b/LayoutTests/java/lc3/JavaClass/ToObject-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaClass/ToString-001.html b/LayoutTests/java/lc3/JavaClass/ToString-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaClass/ToString-001.html
+++ b/LayoutTests/java/lc3/JavaClass/ToString-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectBeanProps-001.html b/LayoutTests/java/lc3/JavaObject/JavaObjectBeanProps-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectBeanProps-001.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectBeanProps-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectFieldOrMethod-001.html b/LayoutTests/java/lc3/JavaObject/JavaObjectFieldOrMethod-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectFieldOrMethod-001.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectFieldOrMethod-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToBoolean-001-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToBoolean-001-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToBoolean-001-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToBoolean-001-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToBoolean-002-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToBoolean-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToBoolean-002-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToBoolean-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-001.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-001.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-002-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-002-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-003-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-003-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-004-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-004-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-004-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-004-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-005.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-005.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-005.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-005.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-006.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-006.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-006.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-006.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-007-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-007-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-007-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-007-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-008-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-008-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-008-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToByte-008-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-001.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-001.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-002.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-002.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-002.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-002.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-003-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-003-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-004.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-004.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-004.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-004.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-005-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-005-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-005-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-005-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-006-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-006-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-006-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToChar-006-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToDouble-001.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToDouble-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToDouble-001.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToDouble-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToFloat-001.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToFloat-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToFloat-001.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToFloat-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-001.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-001.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-002-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-002-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-003-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-003-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-004-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-004-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-004-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToInt-004-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-001.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-001.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-002-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-002-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-003-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-003-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-004-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-004-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-004-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-004-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-005.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-005.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-005.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-005.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-006-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-006-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-006-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToLong-006-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-001.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-001.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-002-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-002-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-002-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-002-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-003-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-003-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-003-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-003-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-004-n.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-004-n.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-004-n.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-004-n.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-005.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-005.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-005.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-005.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-006.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-006.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-006.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToShort-006.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/JavaObject/JavaObjectToString-001.html b/LayoutTests/java/lc3/JavaObject/JavaObjectToString-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/JavaObject/JavaObjectToString-001.html
+++ b/LayoutTests/java/lc3/JavaObject/JavaObjectToString-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/StringMethods/string-001.html b/LayoutTests/java/lc3/StringMethods/string-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/StringMethods/string-001.html
+++ b/LayoutTests/java/lc3/StringMethods/string-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/forin/array-001.html-disabled b/LayoutTests/java/lc3/forin/array-001.html-disabled
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/forin/array-001.html-disabled
+++ b/LayoutTests/java/lc3/forin/array-001.html-disabled
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/forin/object-001.html b/LayoutTests/java/lc3/forin/object-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/forin/object-001.html
+++ b/LayoutTests/java/lc3/forin/object-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/java/lc3/instanceof/instanceof-001.html b/LayoutTests/java/lc3/instanceof/instanceof-001.html
index c1f1681..4bb1d42 100644
--- a/LayoutTests/java/lc3/instanceof/instanceof-001.html
+++ b/LayoutTests/java/lc3/instanceof/instanceof-001.html
@@ -4,9 +4,9 @@
 <meta charset="utf-8">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitJavaEnabled", "1");
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.overridePreference("WebKitJavaEnabled", "1");
+    testRunner.waitUntilDone();
 }
 </script>
 </head>
@@ -49,7 +49,7 @@
 function shouldBeWithErrorCheck(_a, _b)
 {
     // Don't want full stack traces from Java exceptions.
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         try {
             eval(_a);
         } catch (ex) {
diff --git a/LayoutTests/jquery/resources/helper.js b/LayoutTests/jquery/resources/helper.js
index 8e2e907..0903cbb 100644
--- a/LayoutTests/jquery/resources/helper.js
+++ b/LayoutTests/jquery/resources/helper.js
@@ -1,6 +1,6 @@
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone()
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone()
 }
 
 window.addEventListener('message', function (evt) {
@@ -9,8 +9,8 @@
     var results = document.getElementsByTagName('iframe')[0].contentDocument.querySelector('#qunit-testresult').textContent;
     var key = 'milliseconds.';
     alert(results.substr(results.indexOf(key) + key.length));
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 
 document.write('<style>iframe { width: 100%; height: 100%; }</style>');
diff --git a/LayoutTests/loader/go-back-to-different-window-size.html b/LayoutTests/loader/go-back-to-different-window-size.html
index 812de02..8ac3ab3c 100644
--- a/LayoutTests/loader/go-back-to-different-window-size.html
+++ b/LayoutTests/loader/go-back-to-different-window-size.html
@@ -8,8 +8,8 @@
 // 4- loads this page which will restore the timer to check the window width to make sure it's > 300
 function verifyWindowSizeAfterNavigateBackToCachedPage() {
     document.body.innerHTML = (window.innerWidth > 300) ? 'PASS' : 'FAIL';    
-    if (window.layoutTestController)
-      layoutTestController.notifyDone();
+    if (window.testRunner)
+      testRunner.notifyDone();
 }
 
 function navigateAwayAndBack() {
@@ -26,10 +26,10 @@
 }
 
 function runTestStep() {
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
-      layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
+      testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
     }
     window.resizeTo(300, 300);
     // Wait a bit before navigating away to make sure we have done layout due to the resizing.
diff --git a/LayoutTests/loader/load-defer-resume-crash.html b/LayoutTests/loader/load-defer-resume-crash.html
index 560cfc9..e3d22b2 100644
--- a/LayoutTests/loader/load-defer-resume-crash.html
+++ b/LayoutTests/loader/load-defer-resume-crash.html
@@ -1,17 +1,17 @@
 <html>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function run() {
     var frameElement = document.createElement('iframe')
     frameElement.setAttribute("src", "resources/images.html");
     document.getElementById("frameDiv").appendChild(frameElement);
-    if (window.layoutTestController) {
-        layoutTestController.setDefersLoading(true);
-        setTimeout("layoutTestController.setDefersLoading(false);layoutTestController.notifyDone();",1000);
+    if (window.testRunner) {
+        testRunner.setDefersLoading(true);
+        setTimeout("testRunner.setDefersLoading(false);testRunner.notifyDone();",1000);
     } else
         alert("Deferring loads");
 }
diff --git a/LayoutTests/loader/navigation-while-deferring-loads.html b/LayoutTests/loader/navigation-while-deferring-loads.html
index 42172fb..720289a 100644
--- a/LayoutTests/loader/navigation-while-deferring-loads.html
+++ b/LayoutTests/loader/navigation-while-deferring-loads.html
@@ -1,14 +1,14 @@
 <html>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 function run() {
     if (history.length > 1) {
         document.body.innerHTML = 'PASS';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
         return;
     }
     var evt = document.createEvent("MouseEvents"); 
@@ -18,6 +18,6 @@
 }
 </script>
 <body onload='run()'>
-    <a id='anchor' href='data:text/html,<script>function deferCallbacks(defer){layoutTestController.setDefersLoading(defer)}</script><body onload="if(window.layoutTestController){deferCallbacks(true);layoutTestController.goBack();deferCallbacks(false)}">FAIL</body>'>go to second page</a>
+    <a id='anchor' href='data:text/html,<script>function deferCallbacks(defer){testRunner.setDefersLoading(defer)}</script><body onload="if(window.testRunner){deferCallbacks(true);testRunner.goBack();deferCallbacks(false)}">FAIL</body>'>go to second page</a>
 </body>
 </html>
diff --git a/LayoutTests/loader/reload-subresource-when-type-changes.html b/LayoutTests/loader/reload-subresource-when-type-changes.html
index ffd5a89..30790f3 100644
--- a/LayoutTests/loader/reload-subresource-when-type-changes.html
+++ b/LayoutTests/loader/reload-subresource-when-type-changes.html
@@ -1,7 +1,7 @@
 <div id="logDiv">FAILED</div>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var logDiv = document.getElementById("logDiv");
 
diff --git a/LayoutTests/mathml/EmptyMFracCrash.xhtml b/LayoutTests/mathml/EmptyMFracCrash.xhtml
index 1bc3edf..cfd28cf 100644
--- a/LayoutTests/mathml/EmptyMFracCrash.xhtml
+++ b/LayoutTests/mathml/EmptyMFracCrash.xhtml
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:m="http://www.w3.org/1998/Math/MathML" xml:lang="en">
 <head>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/LayoutTests/mathml/EmptyMunderOverCrash.xhtml b/LayoutTests/mathml/EmptyMunderOverCrash.xhtml
index e897c8c..cb305be 100644
--- a/LayoutTests/mathml/EmptyMunderOverCrash.xhtml
+++ b/LayoutTests/mathml/EmptyMunderOverCrash.xhtml
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:m="http://www.w3.org/1998/Math/MathML" xml:lang="en">
 <head>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/LayoutTests/mathml/empty-mroot-crash.xhtml b/LayoutTests/mathml/empty-mroot-crash.xhtml
index f4f2bbb..d96c478 100644
--- a/LayoutTests/mathml/empty-mroot-crash.xhtml
+++ b/LayoutTests/mathml/empty-mroot-crash.xhtml
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:m="http://www.w3.org/1998/Math/MathML" xml:lang="en">
 <head>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/LayoutTests/mathml/empty-msubsup-crash.html b/LayoutTests/mathml/empty-msubsup-crash.html
index 61d4904..81483e1 100644
--- a/LayoutTests/mathml/empty-msubsup-crash.html
+++ b/LayoutTests/mathml/empty-msubsup-crash.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/LayoutTests/mathml/fenced-whitespace-separators-crash.html b/LayoutTests/mathml/fenced-whitespace-separators-crash.html
index ce87b7e..c696bf7 100644
--- a/LayoutTests/mathml/fenced-whitespace-separators-crash.html
+++ b/LayoutTests/mathml/fenced-whitespace-separators-crash.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 </head>
 
diff --git a/LayoutTests/mathml/msub-anonymous-child-render-crash.html b/LayoutTests/mathml/msub-anonymous-child-render-crash.html
index a9affe5..0ad7163 100644
--- a/LayoutTests/mathml/msub-anonymous-child-render-crash.html
+++ b/LayoutTests/mathml/msub-anonymous-child-render-crash.html
@@ -1,7 +1,7 @@
 <html>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 <body>
 <p>This test passes if it does not crash.</p>
diff --git a/LayoutTests/mathml/msubsup-no-grandchild.xhtml b/LayoutTests/mathml/msubsup-no-grandchild.xhtml
index f624a3e..315865c 100644
--- a/LayoutTests/mathml/msubsup-no-grandchild.xhtml
+++ b/LayoutTests/mathml/msubsup-no-grandchild.xhtml
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:m="http://www.w3.org/1998/Math/MathML" xml:lang="en">
 <head>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/LayoutTests/mathml/msubsup-remove-children.xhtml b/LayoutTests/mathml/msubsup-remove-children.xhtml
index bf0fc80..490cb9a 100644
--- a/LayoutTests/mathml/msubsup-remove-children.xhtml
+++ b/LayoutTests/mathml/msubsup-remove-children.xhtml
@@ -3,8 +3,8 @@
   <head>
     <title>Subscript and Superscripts</title>
     <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
     </script>
   </head>
   <body>
diff --git a/LayoutTests/mathml/munderover-remove-children.html b/LayoutTests/mathml/munderover-remove-children.html
index 3fc8fd6..9ce03ab 100644
--- a/LayoutTests/mathml/munderover-remove-children.html
+++ b/LayoutTests/mathml/munderover-remove-children.html
@@ -2,8 +2,8 @@
 <head>
 <title>MathML munder/mover removing children test</title>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/LayoutTests/mathml/operator-hijacks-fenced-node.xhtml b/LayoutTests/mathml/operator-hijacks-fenced-node.xhtml
index 6b76b3c..d40224d 100644
--- a/LayoutTests/mathml/operator-hijacks-fenced-node.xhtml
+++ b/LayoutTests/mathml/operator-hijacks-fenced-node.xhtml
@@ -12,8 +12,8 @@
         <m:math><span><m:mfenced id="target"><m:mo></m:mo></m:mfenced></span></m:math>
     </div>
     <script><![CDATA[
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         document.body.offsetTop;
         document.getElementById("target").parentNode.insertBefore(document.createElement("div"), document.getElementById("target"));
diff --git a/LayoutTests/mathml/wbr-in-mroot-crash.html b/LayoutTests/mathml/wbr-in-mroot-crash.html
index 90b40b7..8b7c56d9 100644
--- a/LayoutTests/mathml/wbr-in-mroot-crash.html
+++ b/LayoutTests/mathml/wbr-in-mroot-crash.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 <body>
 <p>This test shouldn't crash.</p>
diff --git a/LayoutTests/media/W3C/w3cwrapper.js b/LayoutTests/media/W3C/w3cwrapper.js
index 029a2e9..06ae48e 100644
--- a/LayoutTests/media/W3C/w3cwrapper.js
+++ b/LayoutTests/media/W3C/w3cwrapper.js
@@ -9,9 +9,9 @@
 
 function test(testFunction) {
   description(document.title);
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
   }
   try {
     testFunction();
@@ -20,15 +20,15 @@
     testFailed('Aborted with exception: ' + e.message);
   }
   debug('<br /><span class="pass">TEST COMPLETE</span>');
-  if (window.layoutTestController)
-    layoutTestController.notifyDone();
+  if (window.testRunner)
+    testRunner.notifyDone();
 }
 
 function async_test(title, options) {
   description(title);
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+  if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
   }
   var t = {
     step: function(testFunction) {
@@ -42,8 +42,8 @@
 
     done: function() {
       debug('<br /><span class="pass">TEST COMPLETE</span>');
-      if (window.layoutTestController) {
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        testRunner.notifyDone();
       }
     }
   }
diff --git a/LayoutTests/media/adopt-node-crash.html b/LayoutTests/media/adopt-node-crash.html
index 993a14d..ae0dc3d 100644
--- a/LayoutTests/media/adopt-node-crash.html
+++ b/LayoutTests/media/adopt-node-crash.html
@@ -6,9 +6,9 @@
 
         <script>
 
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
             }
 
             function log(msg)
@@ -31,7 +31,7 @@
                 log("EVENT(loadstart) from iframe"); 
                 
                 forceGC();
-                location.href="data:text/html,SUCCESS<script>if (window.layoutTestController) layoutTestController.notifyDone()<" + "/script>";
+                location.href="data:text/html,SUCCESS<script>if (window.testRunner) testRunner.notifyDone()<" + "/script>";
             }
 
             function loadstart()
diff --git a/LayoutTests/media/audio-controls-do-not-fade-out.html b/LayoutTests/media/audio-controls-do-not-fade-out.html
index 4af951d..29dc400 100644
--- a/LayoutTests/media/audio-controls-do-not-fade-out.html
+++ b/LayoutTests/media/audio-controls-do-not-fade-out.html
@@ -7,9 +7,9 @@
 </p>
 <audio id="audio" controls autoplay onplaying="playing()" src="content/silence.wav"></audio><br>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.waitUntilDone();
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.waitUntilDone();
+        testRunner.dumpAsText();
     }
 
     function playing() {
@@ -17,7 +17,7 @@
             var controls = internals.shadowRoot(document.getElementById("audio")).firstChild.firstChild;
             var opacity = getComputedStyle(controls).opacity;
             document.getElementById("result").innerText = opacity < 1 ? "FAIL" : "PASS";
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }, 250)
     }
 </script>
diff --git a/LayoutTests/media/audio-controls-rendering.html b/LayoutTests/media/audio-controls-rendering.html
index 43e0c1d..19636d3 100644
--- a/LayoutTests/media/audio-controls-rendering.html
+++ b/LayoutTests/media/audio-controls-rendering.html
@@ -9,20 +9,20 @@
             {
                 setSrcByTagName("audio", findMediaFile("audio", "content/test"));
 
-                if (window.layoutTestController) {
-                    layoutTestController.waitUntilDone();
+                if (window.testRunner) {
+                    testRunner.waitUntilDone();
                     setTimeout(function() { 
                         document.body.appendChild(document.createTextNode('FAIL')); 
-                        if (window.layoutTestController)
-                                layoutTestController.notifyDone();
+                        if (window.testRunner)
+                                testRunner.notifyDone();
                     } , 8000);
                 }
                 var count = document.getElementsByTagName('audio').length;
                 document.addEventListener("canplaythrough", function () {
                     if (!--count) {
                         document.body.offsetLeft;
-                        if (window.layoutTestController)
-                            layoutTestController.notifyDone();
+                        if (window.testRunner)
+                            testRunner.notifyDone();
                     }
                 }, true);
             }
diff --git a/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html b/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html
index 9b0dd587..052dadf 100644
--- a/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html
+++ b/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html
@@ -5,9 +5,9 @@
         <script src=video-test.js></script>
         <script src=media-controls.js></script>
         <script>
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
             }
 
             function log(msg)
@@ -29,7 +29,7 @@
                 eventSender.mouseDown();
                 eventSender.mouseUp();
 
-                layoutTestController.notifyDone();
+                testRunner.notifyDone();
             }
             
             function deleteAudio()
@@ -46,11 +46,11 @@
             
             function drag()
             {
-                if (!window.layoutTestController)
+                if (!window.testRunner)
                     return;
 
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
 
                 var audio = document.getElementById('audio');
                 var seekCoords;
diff --git a/LayoutTests/media/audio-delete-while-step-button-clicked.html b/LayoutTests/media/audio-delete-while-step-button-clicked.html
index 004c957..461e02d 100644
--- a/LayoutTests/media/audio-delete-while-step-button-clicked.html
+++ b/LayoutTests/media/audio-delete-while-step-button-clicked.html
@@ -6,9 +6,9 @@
         <script src=media-controls.js></script>
 
         <script>
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
             }
 
             function log(msg)
@@ -30,7 +30,7 @@
                 eventSender.mouseDown();
                 eventSender.mouseUp();
 
-                layoutTestController.notifyDone();
+                testRunner.notifyDone();
             }
             
             function deleteAudio()
@@ -45,11 +45,11 @@
             
             function step()
             {
-                if (!window.layoutTestController)
+                if (!window.testRunner)
                     return;
 
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
 
                 var audio = document.getElementById('audio');
 
diff --git a/LayoutTests/media/audio-garbage-collect.html b/LayoutTests/media/audio-garbage-collect.html
index 7218f60..8b55931 100644
--- a/LayoutTests/media/audio-garbage-collect.html
+++ b/LayoutTests/media/audio-garbage-collect.html
@@ -24,8 +24,8 @@
 
 function finish() {
     document.getElementById("result").innerText = "PASS";
-    if (window.layoutTestController) {
-        layoutTestController.notifyDone();
+    if (window.testRunner) {
+        testRunner.notifyDone();
     }
 }
 
diff --git a/LayoutTests/media/audio-no-installed-engines.html b/LayoutTests/media/audio-no-installed-engines.html
index 98e6e55..0535dab 100644
--- a/LayoutTests/media/audio-no-installed-engines.html
+++ b/LayoutTests/media/audio-no-installed-engines.html
@@ -1,8 +1,8 @@
 <html>
     <head>
         <script>
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
             var audio = new Audio("content/empty.wav");
             audio.play();
         </script>
diff --git a/LayoutTests/media/audio-only-video-intrinsic-size.html b/LayoutTests/media/audio-only-video-intrinsic-size.html
index f7cee31..e986d06 100644
--- a/LayoutTests/media/audio-only-video-intrinsic-size.html
+++ b/LayoutTests/media/audio-only-video-intrinsic-size.html
@@ -5,9 +5,9 @@
 </p>
 <pre id="console"></pre>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function log(message)
@@ -21,6 +21,6 @@
     function loadedMetadata()
     {
         log("Dimensions after metadata loaded: " + videoElement.offsetWidth + "\u00d7" + videoElement.offsetHeight);        
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     }
 </script>
diff --git a/LayoutTests/media/audio-repaint.html b/LayoutTests/media/audio-repaint.html
index 5ca69f8..c203333 100644
--- a/LayoutTests/media/audio-repaint.html
+++ b/LayoutTests/media/audio-repaint.html
@@ -7,11 +7,11 @@
 <audio controls autoplay onplaying="playing(1)" src="content/silence.wav" style="margin-bottom:25px; -webkit-box-reflect:below;"></audio><br/>
 <audio controls autoplay onplaying="playing(2)" src="content/silence.wav" style="margin:27px 0; -webkit-transform: rotate(15deg);"></audio><br>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
-    if (window.layoutTestController)
-        layoutTestController.display();
+    if (window.testRunner)
+        testRunner.display();
 
     var count = 3;
     var audioElements = document.getElementsByTagName('audio');
@@ -20,8 +20,8 @@
         var audio = audioElements[i];
         audio.pause();
         audio.addEventListener("seeked", function() {
-        if (!--count && window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (!--count && window.testRunner)
+            testRunner.notifyDone();
         }, true);
         audio.currentTime = audio.duration * 0.50;
     }
diff --git a/LayoutTests/media/context-menu-actions.html b/LayoutTests/media/context-menu-actions.html
index ae80f14..3a8fdef 100644
--- a/LayoutTests/media/context-menu-actions.html
+++ b/LayoutTests/media/context-menu-actions.html
@@ -6,9 +6,9 @@
 
             function playing()
             {
-                if (window.layoutTestController) {
+                if (window.testRunner) {
                     if (!window.eventSender) {
-                        layoutTestController.dumpAsText();
+                        testRunner.dumpAsText();
                         endTest();
                         return;
                     }
@@ -70,7 +70,7 @@
 
                     // TODO: test copy link location and open in new window.
                  }
-                 layoutTestController.dumpAsText();
+                 testRunner.dumpAsText();
                  endTest();
             }
 
diff --git a/LayoutTests/media/controls-after-reload.html b/LayoutTests/media/controls-after-reload.html
index 0fb5b25e..172306f 100644
--- a/LayoutTests/media/controls-after-reload.html
+++ b/LayoutTests/media/controls-after-reload.html
@@ -4,15 +4,15 @@
     <script>
     var video;
 
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
     function finish()
     {
         video.removeEventListener("seeked", finish);
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
     function playing()
diff --git a/LayoutTests/media/controls-drag-timebar.html b/LayoutTests/media/controls-drag-timebar.html
index 5429bce..ae54443 100644
--- a/LayoutTests/media/controls-drag-timebar.html
+++ b/LayoutTests/media/controls-drag-timebar.html
@@ -11,8 +11,8 @@
             var seekCount;
             var moveCount;
 
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
 
             function test()
             {
diff --git a/LayoutTests/media/controls-layout-direction.html b/LayoutTests/media/controls-layout-direction.html
index 4d448f1..9034ee0 100644
--- a/LayoutTests/media/controls-layout-direction.html
+++ b/LayoutTests/media/controls-layout-direction.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <head>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText(true);
+if (window.testRunner)
+    testRunner.dumpAsText(true);
 </script>
 </head>
 <body>
diff --git a/LayoutTests/media/controls-right-click-on-timebar.html b/LayoutTests/media/controls-right-click-on-timebar.html
index f9a0f4c..24bd472 100644
--- a/LayoutTests/media/controls-right-click-on-timebar.html
+++ b/LayoutTests/media/controls-right-click-on-timebar.html
@@ -5,8 +5,8 @@
         <script src=media-file.js></script>
         <script src=video-test.js></script>
         <script>
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText();
+            if (window.testRunner)
+                testRunner.dumpAsText();
 
             function click()
             {
diff --git a/LayoutTests/media/controls-without-preload.html b/LayoutTests/media/controls-without-preload.html
index 4f49058..f90ffa6 100644
--- a/LayoutTests/media/controls-without-preload.html
+++ b/LayoutTests/media/controls-without-preload.html
@@ -2,8 +2,8 @@
     <head>
         <script src=media-file.js></script>
         <script>
-            if (window.layoutTestController)
-                layoutTestController.waitUntilDone();
+            if (window.testRunner)
+                testRunner.waitUntilDone();
 
             var video;
 
@@ -26,8 +26,8 @@
 
             function finish()
             {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
         </script>
     </head>
diff --git a/LayoutTests/media/crash-closing-page-with-media-as-plugin-fallback.html b/LayoutTests/media/crash-closing-page-with-media-as-plugin-fallback.html
index b567536..4cb44b1 100644
--- a/LayoutTests/media/crash-closing-page-with-media-as-plugin-fallback.html
+++ b/LayoutTests/media/crash-closing-page-with-media-as-plugin-fallback.html
@@ -9,13 +9,13 @@
 <div id="result"></div><br>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
-    layoutTestController.overridePreference("WebKitPageCacheSupportsPluginsPreferenceKey", 1);
-    layoutTestController.setCanOpenWindows(true);
-    layoutTestController.setCloseRemainingWindowsWhenComplete(true);
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+    testRunner.overridePreference("WebKitPageCacheSupportsPluginsPreferenceKey", 1);
+    testRunner.setCanOpenWindows(true);
+    testRunner.setCloseRemainingWindowsWhenComplete(true);
     var button = document.getElementById("button");
     eventSender.mouseMoveTo(button.offsetParent.offsetLeft + button.offsetLeft + button.offsetWidth / 2, button.offsetParent.offsetTop +  button.offsetTop + button.offsetHeight / 2);
     eventSender.mouseDown();
@@ -32,8 +32,8 @@
 {
     if (childWindow.closed) {
         document.getElementById("result").innerText = "Closed the window without crashing!";
-        if (window.layoutTestController)
-            setTimeout("layoutTestController.notifyDone();", 0);
+        if (window.testRunner)
+            setTimeout("testRunner.notifyDone();", 0);
     }
     setTimeout("checkClosed()", 0);
 }
diff --git a/LayoutTests/media/fallback.html b/LayoutTests/media/fallback.html
index 509e03e..38b1187 100644
--- a/LayoutTests/media/fallback.html
+++ b/LayoutTests/media/fallback.html
@@ -1,6 +1,6 @@
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 <p>Test that fallback content is not rendered</p>
 <video>FAIL<b>FAIL</b></video>
diff --git a/LayoutTests/media/media-blocked-by-beforeload.html b/LayoutTests/media/media-blocked-by-beforeload.html
index 1b8109d..8f2f0fc 100644
--- a/LayoutTests/media/media-blocked-by-beforeload.html
+++ b/LayoutTests/media/media-blocked-by-beforeload.html
@@ -13,8 +13,8 @@
     and does not block the document's 'load' event.</p>
 
     <script>
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
 
         var blockedURL;
         var allowedURL;
diff --git a/LayoutTests/media/media-blocked-by-willsendrequest.html b/LayoutTests/media/media-blocked-by-willsendrequest.html
index 6372e34..8e91d86 100644
--- a/LayoutTests/media/media-blocked-by-willsendrequest.html
+++ b/LayoutTests/media/media-blocked-by-willsendrequest.html
@@ -12,9 +12,9 @@
     <script>
         var events = [];
 
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.setWillSendRequestReturnsNull(true);
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.setWillSendRequestReturnsNull(true);
         } else
             consoleWrite("<b><em>This test can only be run in DumpRenderTree!</em></b><br><br>");
 
diff --git a/LayoutTests/media/media-controls-clone-crash.html b/LayoutTests/media/media-controls-clone-crash.html
index 70a93c1..11c1521 100644
--- a/LayoutTests/media/media-controls-clone-crash.html
+++ b/LayoutTests/media/media-controls-clone-crash.html
@@ -2,10 +2,10 @@
     <body onload="runTest();">

         Test passes if it does not crash.

         <script>

-            if (window.layoutTestController)

+            if (window.testRunner)

             {

-                layoutTestController.dumpAsText();

-                layoutTestController.waitUntilDone();

+                testRunner.dumpAsText();

+                testRunner.waitUntilDone();

             }

 

             function runTest() {

@@ -16,8 +16,8 @@
                 var clone = node.cloneNode(false);

                 clone.load();

  

-                if (window.layoutTestController)

-                    setTimeout("layoutTestController.notifyDone()", 0);

+                if (window.testRunner)

+                    setTimeout("testRunner.notifyDone()", 0);

             }

         </script>

     </body>

diff --git a/LayoutTests/media/media-controls-invalid-url.html b/LayoutTests/media/media-controls-invalid-url.html
index cdf64cf..38a565c 100644
--- a/LayoutTests/media/media-controls-invalid-url.html
+++ b/LayoutTests/media/media-controls-invalid-url.html
@@ -54,7 +54,7 @@
 
             function start()
             {
-                if (!window.layoutTestController)
+                if (!window.testRunner)
                     return;
 
                 try {
diff --git a/LayoutTests/media/media-document-audio-repaint.html b/LayoutTests/media/media-document-audio-repaint.html
index 8fe2f53..df3189e 100644
--- a/LayoutTests/media/media-document-audio-repaint.html
+++ b/LayoutTests/media/media-document-audio-repaint.html
@@ -1,19 +1,19 @@
 <script>
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
     function onPause()
     {
         var videoElement = document.getElementById("fr").contentDocument.querySelector("video");
-        if (window.layoutTestController)
-            layoutTestController.display();
+        if (window.testRunner)
+            testRunner.display();
         videoElement.currentTime = videoElement.duration * 0.50;
     }
 
     function onSeeked()
     {
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
     function onPlay()
diff --git a/LayoutTests/media/media-document-audio-size.html b/LayoutTests/media/media-document-audio-size.html
index d3f7f95c..f826e72 100644
--- a/LayoutTests/media/media-document-audio-size.html
+++ b/LayoutTests/media/media-document-audio-size.html
@@ -4,9 +4,9 @@
 </p>
 <pre id="console"></pre>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function log(message)
@@ -23,8 +23,8 @@
             log("PASS");
         else
             log("FAIL: the video element dimensions are " + elementWidth + " by " + elementHeight);
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 </script>
 <iframe src="content/test.wav" id="fr" width=380 height=330 onload="frameLoaded()"></iframe>
diff --git a/LayoutTests/media/media-fullscreen.js b/LayoutTests/media/media-fullscreen.js
index 5c617a6..8a5f389 100644
--- a/LayoutTests/media/media-fullscreen.js
+++ b/LayoutTests/media/media-fullscreen.js
@@ -66,7 +66,7 @@
         testException("mediaElement.webkitEnterFullScreen()", "DOMException.INVALID_STATE_ERR");
 
     // Click on the button
-    if (window.layoutTestController)
+    if (window.testRunner)
         setTimeout(clickEnterFullscreenButton, 10);
     else
         openNextMovie();
diff --git a/LayoutTests/media/media-volume-slider-rendered-normal.html b/LayoutTests/media/media-volume-slider-rendered-normal.html
index 85669e32..d997c06 100644
--- a/LayoutTests/media/media-volume-slider-rendered-normal.html
+++ b/LayoutTests/media/media-volume-slider-rendered-normal.html
@@ -28,7 +28,7 @@
                     muteButtonCoordinates = mediaControlsButtonCoordinates(video, "mute-button");
                     volumeSliderCoordinates = mediaControlsButtonCoordinates(video, "volume-slider-container");
                 } catch (exception) {
-                    layoutTestController.notifyDone();
+                    testRunner.notifyDone();
                     return;
                 }
             }
@@ -58,7 +58,7 @@
             consoleWrite("** The volume slider should be on top of the mute button **");
             testExpected("volumeSliderElement.offsetTop < muteButtonElement.offsetTop", true);
 
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     </script>
 </head>
diff --git a/LayoutTests/media/no-auto-play-in-sandbox.html b/LayoutTests/media/no-auto-play-in-sandbox.html
index b1159a9..b3c7f6e 100644
--- a/LayoutTests/media/no-auto-play-in-sandbox.html
+++ b/LayoutTests/media/no-auto-play-in-sandbox.html
@@ -1,7 +1,7 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
 }
 </script>
 <iframe
diff --git a/LayoutTests/media/remove-from-document-before-load.html b/LayoutTests/media/remove-from-document-before-load.html
index fa27217..7ec3c0b 100644
--- a/LayoutTests/media/remove-from-document-before-load.html
+++ b/LayoutTests/media/remove-from-document-before-load.html
@@ -1,11 +1,11 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 </script>
 <body onload="document.body.innerHTML='PASS: A crash did not occur when the media element was removed before loading.';
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();">
+    if (window.testRunner)
+        testRunner.notifyDone();">
 <video src="A"></video>
 </body>
\ No newline at end of file
diff --git a/LayoutTests/media/restore-from-page-cache.html b/LayoutTests/media/restore-from-page-cache.html
index a125e42..1db209f 100644
--- a/LayoutTests/media/restore-from-page-cache.html
+++ b/LayoutTests/media/restore-from-page-cache.html
@@ -6,10 +6,10 @@
             var mediaFile = findMediaFile("video", "content/test");
             var loadCount = 0;
 
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
-                layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
+                testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
             }
 
             function pageshow(evt) 
@@ -24,7 +24,7 @@
                     
                     // schedule the test to end shortly, but wait long enough for the element to fire loading events
                     //  if that is going to happen
-                    setTimeout(function() { if (window.layoutTestController) layoutTestController.notifyDone(); }, 200);
+                    setTimeout(function() { if (window.testRunner) testRunner.notifyDone(); }, 200);
                 }
             }
                 
diff --git a/LayoutTests/media/svg-as-image-with-media-blocked.html b/LayoutTests/media/svg-as-image-with-media-blocked.html
index 309b928..ae1a196 100644
--- a/LayoutTests/media/svg-as-image-with-media-blocked.html
+++ b/LayoutTests/media/svg-as-image-with-media-blocked.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 </head>
 <body>
diff --git a/LayoutTests/media/video-beforeload-remove-source.html b/LayoutTests/media/video-beforeload-remove-source.html
index b0eb86b..8bdf59a 100644
--- a/LayoutTests/media/video-beforeload-remove-source.html
+++ b/LayoutTests/media/video-beforeload-remove-source.html
@@ -3,9 +3,9 @@
     <head>
         <script src=../resources/gc.js></script>
         <script>
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
         }
 
         function removeNodes(start, end) {
@@ -23,8 +23,8 @@
             removeNodes(start, end);
 
             gc();
-            if (window.layoutTestController)
-                setTimeout("layoutTestController.notifyDone()", 0);
+            if (window.testRunner)
+                setTimeout("testRunner.notifyDone()", 0);
         }
 
         document.addEventListener("beforeload", beforeLoadFunc, true);
diff --git a/LayoutTests/media/video-canvas-alpha.html b/LayoutTests/media/video-canvas-alpha.html
index 9001ae1..9ee1454 100644
--- a/LayoutTests/media/video-canvas-alpha.html
+++ b/LayoutTests/media/video-canvas-alpha.html
@@ -3,8 +3,8 @@
   <script src="media-file.js"></script>
 
   <script>
-    if (window.layoutTestController) {
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.waitUntilDone();
     }
 
     function onLoad() {
@@ -19,8 +19,8 @@
         ctx.globalAlpha = 0.5;
         ctx.drawImage(video, 0, 0);
 
-        if (window.layoutTestController) {
-          layoutTestController.notifyDone();
+        if (window.testRunner) {
+          testRunner.notifyDone();
         }
       }); 
     }
diff --git a/LayoutTests/media/video-click-dblckick-standalone.html b/LayoutTests/media/video-click-dblckick-standalone.html
index 1e22fe8..7fc83d8 100644
--- a/LayoutTests/media/video-click-dblckick-standalone.html
+++ b/LayoutTests/media/video-click-dblckick-standalone.html
@@ -2,9 +2,9 @@
     <head>
         <script src=media-file.js></script>
         <script>
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
         }
 
         var video;
@@ -45,8 +45,8 @@
             else
                 log("FAIL: video should be playing");
 
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
+            if (window.testRunner)
+                testRunner.notifyDone();
         }
         </script>
     </head>
diff --git a/LayoutTests/media/video-controls-in-media-document.html b/LayoutTests/media/video-controls-in-media-document.html
index 705f9e9..a795def 100644
--- a/LayoutTests/media/video-controls-in-media-document.html
+++ b/LayoutTests/media/video-controls-in-media-document.html
@@ -12,7 +12,7 @@
     var video = event.target;
     controls = internals.shadowRoot(video).firstChild.firstChild;
     testExpected("controls.offsetTop + controls.offsetHeight", video.offsetHeight, "<=");
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 };
 
 function start() {
diff --git a/LayoutTests/media/video-controls-no-scripting.html b/LayoutTests/media/video-controls-no-scripting.html
index d2431dd..ce58a7f 100644
--- a/LayoutTests/media/video-controls-no-scripting.html
+++ b/LayoutTests/media/video-controls-no-scripting.html
@@ -5,7 +5,7 @@
         <script>
         function setup()
         {
-            if (!window.layoutTestController) {
+            if (!window.testRunner) {
                 consoleWrite("This test only works in DRT.");
                 return;
             }
diff --git a/LayoutTests/media/video-controls-toggling.html b/LayoutTests/media/video-controls-toggling.html
index 8185d57..de5b3761 100644
--- a/LayoutTests/media/video-controls-toggling.html
+++ b/LayoutTests/media/video-controls-toggling.html
@@ -28,7 +28,7 @@
                 try {
                     muteButtonCoordinates = mediaControlsButtonCoordinates(video, "mute-button");
                 } catch (exception) {
-                    layoutTestController.notifyDone();
+                    testRunner.notifyDone();
                     return;
                 }
 
diff --git a/LayoutTests/media/video-controls-visible-audio-only.html b/LayoutTests/media/video-controls-visible-audio-only.html
index f8dd585..a267a38 100644
--- a/LayoutTests/media/video-controls-visible-audio-only.html
+++ b/LayoutTests/media/video-controls-visible-audio-only.html
@@ -8,9 +8,9 @@
         <script src=media-file.js></script>
         <script src=media-controls.js></script>
         <script>
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.waitUntilDone();
             }
 
             var video;
@@ -34,7 +34,7 @@
                 video = document.getElementById("no-video-media");
 
                 testcondition("video.paused");
-                if (!window.layoutTestController)
+                if (!window.testRunner)
                     return;
 
                 // start playback
@@ -43,7 +43,7 @@
                     playCoords = mediaControlsButtonCoordinates(video, "play-button");
                 } catch (exception) {
                     consoleWrite(exception.description);
-                    layoutTestController.notifyDone();
+                    testRunner.notifyDone();
                     return;
                 }
                 var clickX = playCoords[0];
@@ -58,14 +58,14 @@
                 eventSender.mouseMoveTo(target.offsetLeft + 4, target.offsetTop + 4);
 
                 // controller should still be visible after a second
-                setTimeout(function() { layoutTestController.notifyDone(); } , 1000);
+                setTimeout(function() { testRunner.notifyDone(); } , 1000);
             }
 
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 setTimeout(function() { 
                     document.body.appendChild(document.createTextNode('FAIL')); 
-                    if (window.layoutTestController)
-                        layoutTestController.notifyDone();
+                    if (window.testRunner)
+                        testRunner.notifyDone();
                 } , 8000);
             }
 
diff --git a/LayoutTests/media/video-controls-with-mutation-event-handler.html b/LayoutTests/media/video-controls-with-mutation-event-handler.html
index d4881f2..5a1aebc 100644
--- a/LayoutTests/media/video-controls-with-mutation-event-handler.html
+++ b/LayoutTests/media/video-controls-with-mutation-event-handler.html
@@ -10,8 +10,8 @@
         <script>
             function runTest()
             {
-                if (window.layoutTestController)
-                    layoutTestController.dumpAsText();
+                if (window.testRunner)
+                    testRunner.dumpAsText();
 
                 document.body.addEventListener("DOMSubtreeModified", function () { }, false);
 
diff --git a/LayoutTests/media/video-delay-load-event.html b/LayoutTests/media/video-delay-load-event.html
index 1c6a9d9..b1d8020 100644
--- a/LayoutTests/media/video-delay-load-event.html
+++ b/LayoutTests/media/video-delay-load-event.html
@@ -39,8 +39,8 @@
                 testMovieWithSource(document.getElementById('video-2'), true, "<br><em>with 'src' attribute.</em>");
                 testMovieWithSource(document.getElementById('video-3'), true, "<br><em>with &lt;source&gt; element.</em>");
 
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
         </script>
     </head>
diff --git a/LayoutTests/media/video-display-toggle.html b/LayoutTests/media/video-display-toggle.html
index 9b7e037..83aae36 100644
--- a/LayoutTests/media/video-display-toggle.html
+++ b/LayoutTests/media/video-display-toggle.html
@@ -14,8 +14,8 @@
             }
             function test()
             {
-                if (window.layoutTestController)
-                    layoutTestController.waitUntilDone();
+                if (window.testRunner)
+                    testRunner.waitUntilDone();
                 setSrcById('vid', findMediaFile('video', 'content/test'));
                 var video = document.getElementById('vid');
                 video.addEventListener("canplaythrough", test2);
@@ -28,8 +28,8 @@
             }
             function done()
             {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
         </script>
     </head>
diff --git a/LayoutTests/media/video-document-types.html b/LayoutTests/media/video-document-types.html
index cd6b1e7..b0fa40c 100644
--- a/LayoutTests/media/video-document-types.html
+++ b/LayoutTests/media/video-document-types.html
@@ -1,9 +1,9 @@
 <html>
     <head>
         <script>
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
         }
 
         function log(msg)
@@ -19,8 +19,8 @@
             else
                 log("FAIL: <video> NOT used");
 
-            if (window.layoutTestController) {
-                layoutTestController.notifyDone();
+            if (window.testRunner) {
+                testRunner.notifyDone();
             }
         }
         </script>
diff --git a/LayoutTests/media/video-element-other-namespace-crash.html b/LayoutTests/media/video-element-other-namespace-crash.html
index e2e0d08..b3e9357 100644
--- a/LayoutTests/media/video-element-other-namespace-crash.html
+++ b/LayoutTests/media/video-element-other-namespace-crash.html
@@ -1,9 +1,9 @@
 <html>

 <script>

-if (window.layoutTestController)

+if (window.testRunner)

 { 

-    layoutTestController.dumpAsText();

-    layoutTestController.waitUntilDone();

+    testRunner.dumpAsText();

+    testRunner.waitUntilDone();

 }

 

 function runTest()

@@ -18,8 +18,8 @@
         container.dispatchEvent(event);

         

         document.body.appendChild(document.createTextNode('PASS, did not crash.'));

-        if (window.layoutTestController)

-            layoutTestController.notifyDone();

+        if (window.testRunner)

+            testRunner.notifyDone();

     }

 

     frame.src = 'content/test.mp4';

diff --git a/LayoutTests/media/video-empty-source.html b/LayoutTests/media/video-empty-source.html
index 3c0804a..795501e 100644
--- a/LayoutTests/media/video-empty-source.html
+++ b/LayoutTests/media/video-empty-source.html
@@ -1,13 +1,13 @@
 <html>
     <head>
         <script>
-            if (window.layoutTestController)
-                layoutTestController.waitUntilDone();
+            if (window.testRunner)
+                testRunner.waitUntilDone();
     
             function test()
             {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
         </script>
     </head>
diff --git a/LayoutTests/media/video-no-audio.html b/LayoutTests/media/video-no-audio.html
index f411e15..2258625 100644
--- a/LayoutTests/media/video-no-audio.html
+++ b/LayoutTests/media/video-no-audio.html
@@ -2,8 +2,8 @@
     <head>
         <script src=media-file.js></script>
         <script>
-            if (window.layoutTestController)
-                layoutTestController.waitUntilDone();
+            if (window.testRunner)
+                testRunner.waitUntilDone();
     
             function start()
             {
@@ -12,8 +12,8 @@
 
             function finish()
             {
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }
         </script>
     </head>
diff --git a/LayoutTests/media/video-paint-test.js b/LayoutTests/media/video-paint-test.js
index 5dd289a..aad1f86 100644
--- a/LayoutTests/media/video-paint-test.js
+++ b/LayoutTests/media/video-paint-test.js
@@ -21,18 +21,18 @@
         }
 
         waitForMultipleEvents("seeked", videos.length, function() {
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
+            if (window.testRunner)
+                testRunner.notifyDone();
         });
     });
 }
 
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
     setTimeout(function() { 
         document.body.appendChild(document.createTextNode('FAIL')); 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     } , 8000);
 }
 
@@ -49,8 +49,8 @@
         }
 
         waitForMultipleEvents("pause", videos.length, function() {
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
+            if (window.testRunner)
+                testRunner.notifyDone();
         });
     });
 
@@ -61,7 +61,7 @@
     var videos = document.getElementsByTagName('video');
 
     waitForMultipleEvents("seeked", videos.length, function() {
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     });
 }
diff --git a/LayoutTests/media/video-plays-past-end-of-test.html b/LayoutTests/media/video-plays-past-end-of-test.html
index 8591b5d..f2f8349 100644
--- a/LayoutTests/media/video-plays-past-end-of-test.html
+++ b/LayoutTests/media/video-plays-past-end-of-test.html
@@ -5,8 +5,8 @@
 <script src=media-file.js></script>
 <script src=video-test.js></script>
 <script type="text/javascript">
-if (window.layoutTestController)
-  layoutTestController.dumpAsText();
+if (window.testRunner)
+  testRunner.dumpAsText();
 waitForEvent("playing", null, true);
 video.src = findMediaFile("video", "content/test");
 </script>
diff --git a/LayoutTests/media/video-poster-blocked-by-willsendrequest.html b/LayoutTests/media/video-poster-blocked-by-willsendrequest.html
index 2408f8d..46af3d2 100644
--- a/LayoutTests/media/video-poster-blocked-by-willsendrequest.html
+++ b/LayoutTests/media/video-poster-blocked-by-willsendrequest.html
@@ -25,9 +25,9 @@
 
             function start()
             {
-                if (window.layoutTestController) {
-                    layoutTestController.dumpAsText();
-                    layoutTestController.setWillSendRequestReturnsNull(true);
+                if (window.testRunner) {
+                    testRunner.dumpAsText();
+                    testRunner.setWillSendRequestReturnsNull(true);
                 } else
                     consoleWrite("<b>This test can only be run in DumpRenderTree!</b>");
 
diff --git a/LayoutTests/media/video-replaces-poster.html b/LayoutTests/media/video-replaces-poster.html
index 50a388e..290eac1 100644
--- a/LayoutTests/media/video-replaces-poster.html
+++ b/LayoutTests/media/video-replaces-poster.html
@@ -13,8 +13,8 @@
             });
             video.addEventListener("seeked", function() {
                 testExpected(video.currentTime, 1);
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             });
         }
         window.addEventListener('load', doSetup, false);
diff --git a/LayoutTests/media/video-source-inserted.html b/LayoutTests/media/video-source-inserted.html
index 191aee4..20edb0e 100644
--- a/LayoutTests/media/video-source-inserted.html
+++ b/LayoutTests/media/video-source-inserted.html
@@ -21,8 +21,8 @@
             consoleWrite("&lt;source&gt; inserted by script.");
             video.appendChild(document.createElement('source'));
             testExpected("video.networkState", HTMLMediaElement.prototype.NETWORK_NO_SOURCE, "==");
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
+            if (window.testRunner)
+                testRunner.notifyDone();
         </script>
 
     </body>
diff --git a/LayoutTests/media/video-test.js b/LayoutTests/media/video-test.js
index 5c2c7ff..a678ae4 100644
--- a/LayoutTests/media/video-test.js
+++ b/LayoutTests/media/video-test.js
@@ -13,9 +13,9 @@
 findMediaElement();
 logConsole();
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function disableFullTestDetailsPrinting()
@@ -214,8 +214,8 @@
 {
     consoleWrite("END OF TEST");
     testEnded = true;
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function endTestLater()
diff --git a/LayoutTests/media/video-volume-slider.html b/LayoutTests/media/video-volume-slider.html
index 1bbe259..b3ba53d 100644
--- a/LayoutTests/media/video-volume-slider.html
+++ b/LayoutTests/media/video-volume-slider.html
@@ -8,8 +8,8 @@
 
         function init()
         {
-            if (window.layoutTestController)
-                layoutTestController.waitUntilDone();
+            if (window.testRunner)
+                testRunner.waitUntilDone();
 
             video = document.getElementsByTagName("video")[0];
             video.src = findMediaFile("video", "content/test");
@@ -24,15 +24,15 @@
                 try {
                     muteCoords = mediaControlsButtonCoordinates(video, "mute-button");
                 } catch (exception) {
-                    layoutTestController.notifyDone();
+                    testRunner.notifyDone();
                     return;
                 }
                 eventSender.mouseMoveTo(muteCoords[0], muteCoords[1]);
             }
 
             video.addEventListener("volumechange", function() {
-                 if (window.layoutTestController)
-                     layoutTestController.notifyDone();
+                 if (window.testRunner)
+                     testRunner.notifyDone();
             });
         }
     </script>
diff --git a/LayoutTests/media/video-zoom.html b/LayoutTests/media/video-zoom.html
index 42b030c..2fe261d 100644
--- a/LayoutTests/media/video-zoom.html
+++ b/LayoutTests/media/video-zoom.html
@@ -14,17 +14,17 @@
             var count = totalCount;
             document.addEventListener("canplaythrough", function () {
                 if (!--count) {
-                    if (window.layoutTestController)
-                        setTimeout(function() { layoutTestController.notifyDone(); }, totalCount * 150);
+                    if (window.testRunner)
+                        setTimeout(function() { testRunner.notifyDone(); }, totalCount * 150);
                 }
             }, true);
 
-            if (window.layoutTestController) {
-                layoutTestController.waitUntilDone();
+            if (window.testRunner) {
+                testRunner.waitUntilDone();
                 setTimeout(function() { 
                     document.body.appendChild(document.createTextNode('FAIL')); 
-                    if (window.layoutTestController)
-                        layoutTestController.notifyDone();
+                    if (window.testRunner)
+                        testRunner.notifyDone();
                 }, 1500);
             }
         }
diff --git a/LayoutTests/mhtml/check_domain.mht b/LayoutTests/mhtml/check_domain.mht
index 50c1229..07282c0 100644
--- a/LayoutTests/mhtml/check_domain.mht
+++ b/LayoutTests/mhtml/check_domain.mht
@@ -17,9 +17,9 @@
 

 <title>A simple page</title>

 <script>

-if (window.layoutTestController) {

-  layoutTestController.dumpAsText();

-  layoutTestController.waitUntilDone();

+if (window.testRunner) {

+  testRunner.dumpAsText();

+  testRunner.waitUntilDone();

 }

 

 window.onload = function() {

@@ -33,7 +33,7 @@
   }

 

   document.getElementById('locDiv').appendChild(span);

-  layoutTestController.notifyDone();

+  testRunner.notifyDone();

 }

 

 </script>

diff --git a/LayoutTests/mhtml/multi_frames.html_original b/LayoutTests/mhtml/multi_frames.html_original
index cccf8be..8c8e01c 100644
--- a/LayoutTests/mhtml/multi_frames.html_original
+++ b/LayoutTests/mhtml/multi_frames.html_original
@@ -4,9 +4,9 @@
 
 <title>A page that contains multiple nested frames</title>
 <script>
-if (window.layoutTestController) {
-  layoutTestController.dumpAsText();
-  layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+  testRunner.dumpAsText();
+  testRunner.dumpChildFramesAsText();
 }
 </script>
 </head><body>
diff --git a/LayoutTests/mhtml/multi_frames_binary.mht b/LayoutTests/mhtml/multi_frames_binary.mht
index d7ec302b..9043adb 100644
--- a/LayoutTests/mhtml/multi_frames_binary.mht
+++ b/LayoutTests/mhtml/multi_frames_binary.mht
Binary files differ
diff --git a/LayoutTests/mhtml/multi_frames_ie.mht b/LayoutTests/mhtml/multi_frames_ie.mht
index cd4e25b..4048720 100755
--- a/LayoutTests/mhtml/multi_frames_ie.mht
+++ b/LayoutTests/mhtml/multi_frames_ie.mht
@@ -36,9 +36,9 @@
 <META content=3D"text/html; charset=3Dwindows-1252" =

 http-equiv=3DContent-Type>

 <SCRIPT>=0A=

-if (window.layoutTestController) {=0A=

-  layoutTestController.dumpAsText();=0A=

-  layoutTestController.dumpChildFramesAsText();=0A=

+if (window.testRunner) {=0A=

+  testRunner.dumpAsText();=0A=

+  testRunner.dumpChildFramesAsText();=0A=

 }=0A=

 </SCRIPT>

 

diff --git a/LayoutTests/mhtml/multi_frames_unmht.mht b/LayoutTests/mhtml/multi_frames_unmht.mht
index c69246e..1c88776 100755
--- a/LayoutTests/mhtml/multi_frames_unmht.mht
+++ b/LayoutTests/mhtml/multi_frames_unmht.mht
@@ -17,9 +17,9 @@
 

 <title>A page that contains multiple nested frames</title>

 <script>

-if (window.layoutTestController) {

-  layoutTestController.dumpAsText();

-  layoutTestController.dumpChildFramesAsText();

+if (window.testRunner) {

+  testRunner.dumpAsText();

+  testRunner.dumpChildFramesAsText();

 }

 </script>

 <base href=3D"http://localhost/"></base></head><body>

diff --git a/LayoutTests/mhtml/page_with_css_and_js_ie.mht b/LayoutTests/mhtml/page_with_css_and_js_ie.mht
index 71b7284..f69959b 100755
--- a/LayoutTests/mhtml/page_with_css_and_js_ie.mht
+++ b/LayoutTests/mhtml/page_with_css_and_js_ie.mht
@@ -25,9 +25,9 @@
 src=3D"http://localhost/resources/remove_image_script.js"></SCRIPT>

 

 <SCRIPT>=0A=

-    if (window.layoutTestController) {=0A=

-      layoutTestController.dumpAsText();=0A=

-      layoutTestController.waitUntilDone();=0A=

+    if (window.testRunner) {=0A=

+      testRunner.dumpAsText();=0A=

+      testRunner.waitUntilDone();=0A=

     }=0A=

   </SCRIPT>

 

@@ -76,7 +76,7 @@
 function onLoad() {=0A=

     divToRemove =3D document.getElementById("thirdDiv");=0A=

     divToRemove.parentNode.removeChild(divToRemove);=0A=

-    if (window.layoutTestController)=0A=

-      layoutTestController.notifyDone();=0A=

+    if (window.testRunner)=0A=

+      testRunner.notifyDone();=0A=

 }

 ------=_NextPart_000_0012_01CC157B.8AA06570--

diff --git a/LayoutTests/mhtml/page_with_css_and_js_unmht.mht b/LayoutTests/mhtml/page_with_css_and_js_unmht.mht
index d7c3361..4487b72 100755
--- a/LayoutTests/mhtml/page_with_css_and_js_unmht.mht
+++ b/LayoutTests/mhtml/page_with_css_and_js_unmht.mht
@@ -21,9 +21,9 @@
   <script src=3D"resources/remove_image_script.js" type=3D"text/javascript"=

 ></script>

   <script>

-    if (window.layoutTestController) {

-      layoutTestController.dumpAsText();

-      layoutTestController.waitUntilDone();

+    if (window.testRunner) {

+      testRunner.dumpAsText();

+      testRunner.waitUntilDone();

     }

   </script>

 <base href=3D"http://localhost/"></base></head><body onload=3D"onLoad()">

@@ -59,8 +59,8 @@
 function onLoad() {

     divToRemove =3D document.getElementById("thirdDiv");

     divToRemove.parentNode.removeChild(divToRemove);

-    if (window.layoutTestController)

-      layoutTestController.notifyDone();

+    if (window.testRunner)

+      testRunner.notifyDone();

 }

 ------=_NextPart_000_0000_C2ECC76E.5EC79255

 Content-Type: image/png

diff --git a/LayoutTests/mhtml/page_with_image.html_original b/LayoutTests/mhtml/page_with_image.html_original
index a0bc0dd..952869a 100644
--- a/LayoutTests/mhtml/page_with_image.html_original
+++ b/LayoutTests/mhtml/page_with_image.html_original
@@ -4,8 +4,8 @@
 
 <title>Page with square</title>
 <script>
-if (window.layoutTestController) {
-  layoutTestController.dumpAsText();
+if (window.testRunner) {
+  testRunner.dumpAsText();
 }
 
 </script>
diff --git a/LayoutTests/mhtml/page_with_image_ie.mht b/LayoutTests/mhtml/page_with_image_ie.mht
index 1c241ee..96c0925e 100755
--- a/LayoutTests/mhtml/page_with_image_ie.mht
+++ b/LayoutTests/mhtml/page_with_image_ie.mht
@@ -20,8 +20,8 @@
 <META content=3D"text/html; charset=3Dwindows-1252" =

 http-equiv=3DContent-Type>

 <SCRIPT>=0A=

-if (window.layoutTestController) {=0A=

-  layoutTestController.dumpAsText();=0A=

+if (window.testRunner) {=0A=

+  testRunner.dumpAsText();=0A=

 }=0A=

 =0A=

 </SCRIPT>

diff --git a/LayoutTests/mhtml/page_with_image_unmht.mht b/LayoutTests/mhtml/page_with_image_unmht.mht
index 8af1b21..1601551 100755
--- a/LayoutTests/mhtml/page_with_image_unmht.mht
+++ b/LayoutTests/mhtml/page_with_image_unmht.mht
@@ -17,8 +17,8 @@
 

 <title>Page with square</title>

 <script>

-if (window.layoutTestController) {

-  layoutTestController.dumpAsText();

+if (window.testRunner) {

+  testRunner.dumpAsText();

 }

 

 </script>

diff --git a/LayoutTests/mhtml/simple_page.html_original b/LayoutTests/mhtml/simple_page.html_original
index 7d0020d..f2aef2f 100644
--- a/LayoutTests/mhtml/simple_page.html_original
+++ b/LayoutTests/mhtml/simple_page.html_original
@@ -4,8 +4,8 @@
 
 <title>A simple page</title>
 <script>
-if (window.layoutTestController)
-  layoutTestController.dumpAsText();
+if (window.testRunner)
+  testRunner.dumpAsText();
 </script>
 </head><body>
 <h1>This is a very simple page</h1>
diff --git a/LayoutTests/mhtml/simple_page_ie.mht b/LayoutTests/mhtml/simple_page_ie.mht
index 8c0f897..de2caa2 100755
--- a/LayoutTests/mhtml/simple_page_ie.mht
+++ b/LayoutTests/mhtml/simple_page_ie.mht
@@ -13,8 +13,8 @@
 <META content=3D"text/html; charset=3Dwindows-1252" =

 http-equiv=3DContent-Type>

 <SCRIPT>=0A=

-if (window.layoutTestController)=0A=

-  layoutTestController.dumpAsText();=0A=

+if (window.testRunner)=0A=

+  testRunner.dumpAsText();=0A=

 </SCRIPT>

 

 <META name=3DGENERATOR content=3D"MSHTML 9.00.8112.16421"></HEAD>

diff --git a/LayoutTests/mhtml/simple_page_unmht.mht b/LayoutTests/mhtml/simple_page_unmht.mht
index cebedf2..d03c63f 100755
--- a/LayoutTests/mhtml/simple_page_unmht.mht
+++ b/LayoutTests/mhtml/simple_page_unmht.mht
@@ -17,8 +17,8 @@
 

 <title>A simple page</title>

 <script>

-if (window.layoutTestController)

-  layoutTestController.dumpAsText();

+if (window.testRunner)

+  testRunner.dumpAsText();

 </script>

 <base href=3D"http://localhost/"></base></head><body>

 <h1>This is a very simple page</h1>

diff --git a/LayoutTests/networkinformation/resources/event-after-navigation-new.html b/LayoutTests/networkinformation/resources/event-after-navigation-new.html
index 60a7217..d23149b 100644
--- a/LayoutTests/networkinformation/resources/event-after-navigation-new.html
+++ b/LayoutTests/networkinformation/resources/event-after-navigation-new.html
@@ -7,7 +7,7 @@
     SUCCESS
     <script>
         internals.setNetworkInformation(document, 'webkitnetworkinfochange', 100, true);
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     </script>
   </body>
 </html>
diff --git a/LayoutTests/networkinformation/script-tests/event-after-navigation.js b/LayoutTests/networkinformation/script-tests/event-after-navigation.js
index b9fc8d6..0a60863 100644
--- a/LayoutTests/networkinformation/script-tests/event-after-navigation.js
+++ b/LayoutTests/networkinformation/script-tests/event-after-navigation.js
@@ -1,7 +1,7 @@
 description('Tests for a crash where an event is fired after the page has been navigated away when the original page is in the page cache.');
 
-if (window.layoutTestController)
-    layoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
+if (window.testRunner)
+    testRunner.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
 else
     debug('This test can not be run without the LayoutTestController');
 
diff --git a/LayoutTests/platform/chromium/media/video-frame-size-change.html b/LayoutTests/platform/chromium/media/video-frame-size-change.html
index c339aed..2048725 100644
--- a/LayoutTests/platform/chromium/media/video-frame-size-change.html
+++ b/LayoutTests/platform/chromium/media/video-frame-size-change.html
@@ -7,8 +7,8 @@
         <video></video>
 
         <script>
-            if (window.layoutTestController) {
-                layoutTestController.waitUntilDone();
+            if (window.testRunner) {
+                testRunner.waitUntilDone();
             }
 
             function load() {
@@ -24,8 +24,8 @@
                     }
 
                     // Make sure we render the first frame.
-                    if (window.layoutTestController) {
-                        layoutTestController.display();
+                    if (window.testRunner) {
+                        testRunner.display();
                     }
 
                     video.play();
@@ -64,8 +64,8 @@
                             return;
                         }
 
-                        if (window.layoutTestController) {
-                            layoutTestController.notifyDone();
+                        if (window.testRunner) {
+                            testRunner.notifyDone();
                         }
                     }