Attachment 156517 Details for Bug 93176 – Patch

[patch] Patch

bug-93176-20120803224857.patch (text/plain), 83.28 KB, created by Ryosuke Niwa on 2012-08-03 22:49:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2012-08-03 22:49:18 PDT

Size: 83.28 KB

patch

obsolete

>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 124689)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,134 @@
>+2012-08-03  Ryosuke Niwa  <rniwa@webkit.org>
>+
>+        Some tests still refer to layoutTestController instead of testRunner
>+        https://bugs.webkit.org/show_bug.cgi?id=93176
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Apparently there are still some tests referring to layoutTestController.
>+        Removed all of them as found by spotlight.
>+
>+        * batterystatus/script-tests/event-after-navigation.js:
>+        * editing/deleting/smart-editing-disabled.html:
>+        * fast/dom/Geolocation/script-tests/callback-exception.js:
>+        * fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js:
>+        * fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js:
>+        * fast/dom/Geolocation/script-tests/error.js:
>+        * fast/dom/Geolocation/script-tests/maximum-age.js:
>+        * fast/dom/Geolocation/script-tests/multiple-requests.js:
>+        * fast/dom/Geolocation/script-tests/no-page-cache.js:
>+        * fast/dom/Geolocation/script-tests/permission-denied-already-clear-watch.js:
>+        * fast/dom/Geolocation/script-tests/permission-denied-already-error.js:
>+        * fast/dom/Geolocation/script-tests/permission-denied-already-success.js:
>+        * fast/dom/Geolocation/script-tests/permission-denied-stops-watches.js:
>+        * fast/dom/Geolocation/script-tests/permission-denied.js:
>+        * fast/dom/Geolocation/script-tests/position-string.js:
>+        * fast/dom/Geolocation/script-tests/reentrant-error.js:
>+        * fast/dom/Geolocation/script-tests/reentrant-permission-denied.js:
>+        * fast/dom/Geolocation/script-tests/reentrant-success.js:
>+        * fast/dom/Geolocation/script-tests/success.js:
>+        * fast/dom/Geolocation/script-tests/timeout.js:
>+        * fast/dom/Geolocation/script-tests/watch.js:
>+        * fast/dom/Geolocation/script-tests/window-close-crash.js:
>+        * fast/encoding/resources/char-encoding-utils.js:
>+        (testsDone):
>+        * fast/encoding/resources/dynamic-load-target.js:
>+        * fast/encoding/resources/invalid-xml.js:
>+        (runNextTest):
>+        * fast/encoding/resources/parser-tests.js:
>+        (dotest.window.receivedResults):
>+        (dotest):
>+        * fast/events/touch/script-tests/touch-slider-no-js-touch-listener.js:
>+        * fast/events/touch/script-tests/touch-slider.js:
>+        (onKeyDown):
>+        * fast/harness/override-preferences-2-expected.txt:
>+        * fast/harness/override-preferences-2.html:
>+        * fast/harness/override-preferences-expected.txt:
>+        * fast/harness/override-preferences.html:
>+        * fast/harness/override-zzz-reset-expected.txt:
>+        * fast/harness/override-zzz-reset.html:
>+        * fast/harness/resources/results-test.js:
>+        * fast/harness/use-page-cache-expected.txt:
>+        * fast/harness/use-page-cache.html:
>+        * fast/ruby/after-block-doesnt-crash.html-disabled:
>+        * fast/ruby/after-table-doesnt-crash.html-disabled:
>+        * fast/ruby/generated-after-counter-doesnt-crash.html-disabled:
>+        * fast/ruby/generated-before-and-after-counter-doesnt-crash.html-disabled:
>+        * http/tests/eventsource/eventsource-events-after-close.html:
>+        * http/tests/misc/gmail-assert-on-load.html:
>+        * http/tests/misc/resources/char-encoding-in-hidden-charset-field.php:
>+        * http/tests/misc/resources/check-keygen-post.php:
>+        * http/tests/misc/resources/check-query-param.php:
>+        * http/tests/misc/resources/check-unnamed-file-included-in-formdata.php:
>+        * http/tests/misc/resources/chromium-selectionAsMarkup.html:
>+        * http/tests/misc/resources/delayed-log.php:
>+        * http/tests/misc/resources/form-post-textplain.php:
>+        * http/tests/misc/resources/location-test-xsl-style-sheet.xsl:
>+        * http/tests/misc/resources/percent-sign-in-form-data-field-name.cgi:
>+        * http/tests/misc/resources/post-echo-and-notify-done.cgi:
>+        * http/tests/misc/resources/prefetch-purpose.php:
>+        * http/tests/misc/resources/redirect-result.php:
>+        * http/tests/misc/resources/referrer-main-resource.php:
>+        * http/tests/misc/resources/referrer-result.php:
>+        * http/tests/misc/xhtml.php:
>+        * http/tests/misc/xmltokenizer-do-not-crash.pl:
>+        * http/tests/multipart/multipart-replace-non-html-content.php:
>+        * http/tests/multipart/policy-ignore-crash.php:
>+        * http/tests/multipart/win-boundary-crash.html-disabled:
>+        * http/tests/navigation/post-goback-repost-policy.html-disabled:
>+        * http/tests/navigation/resources/back-send-referrer-helper.php:
>+        * http/tests/navigation/resources/check-ping.php:
>+        * http/tests/navigation/resources/document-location.js:
>+        (start):
>+        * http/tests/navigation/resources/form-target.pl:
>+        * http/tests/navigation/resources/goback-with-policydelegate.php:
>+        * http/tests/navigation/resources/no-referrer-helper.php:
>+        * http/tests/navigation/resources/no-referrer-same-window-helper.php:
>+        * http/tests/navigation/resources/notify-done.html:
>+        * http/tests/navigation/resources/post-target-policy-test.php:
>+        * http/tests/navigation/resources/redirect-cycle-1.pl:
>+        * http/tests/navigation/resources/redirect302-metaredirect.pl:
>+        * http/tests/navigation/resources/redirected-post-request-contents.php:
>+        * http/tests/navigation/resources/submit-to-fragment.pl:
>+        * http/tests/navigation/resources/testcode.js:
>+        (runBasicTest):
>+        (runBackTest):
>+        (runLoadChildFrameTest):
>+        (runLoadChildFrameBackTest):
>+        (runReloadTest):
>+        (runLoadSameTest):
>+        (runRedirectReloadTest):
>+        * http/tests/navigation/useragent.php:
>+        * http/tests/resources/js-test-post.js:
>+        * http/tests/resources/js-test-pre.js:
>+        (finishJSTest):
>+        * http/tests/security/contentSecurityPolicy/resources/securitypolicy-tests-base.js:
>+        * http/tests/ssl/resources/no-http-referer.cgi:
>+        * http/tests/ssl/verify-ssl-enabled.php:
>+        * networkinformation/script-tests/event-after-navigation.js:
>+        * platform/mac/fast/objc/script-tests/webScriptObject-hasWebScriptKey.js:
>+        * platform/qt/svg/repaint/filter-repaint-expected.txt:
>+        * transforms/3d/hit-testing/resources/hit-test-utils.js:
>+        * transforms/3d/point-mapping/point-mapping-helpers.js:
>+        (runTest):
>+        * transitions/resources/transition-test-helpers.js:
>+        (expected):
>+        * transitions/transition-end-event-helpers.js:
>+        (runTransitionTest.processEndEvents):
>+        * webaudio/resources/audio-codec-test.js:
>+        (runDecodingTest):
>+        (finishedLoading):
>+        * webaudio/resources/audio-testing.js:
>+        (finishAudioTest):
>+        * webaudio/resources/audioparam-testing.js:
>+        (createAudioGraphAndTest):
>+        * webaudio/resources/oscillator-testing.js:
>+        (generateExponentialOscillatorSweep):
>+        * webintents/resources/web-intents-testing.js:
>+        (onSuccess):
>+        (onFailure):
>+        (startIntentWithCallbacks):
>+
> 2012-08-03  Ami Fischman  <fischman@chromium.org>
> 
>         [Chromium] Layout Test http/tests/media/media-source/webm/video-media-source-*.html is flaky
>Index: LayoutTests/batterystatus/script-tests/event-after-navigation.js
>===================================================================
>--- LayoutTests/batterystatus/script-tests/event-after-navigation.js	(revision 124689)
>+++ LayoutTests/batterystatus/script-tests/event-after-navigation.js	(working copy)
>@@ -3,7 +3,7 @@ description('Tests for a crash where an 
> if (window.testRunner)
>     testRunner.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
> else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> document.body.onload = function() {
>     navigator.webkitBattery.addEventListener('chargingchange', function() { } );
>Index: LayoutTests/editing/deleting/smart-editing-disabled.html
>===================================================================
>--- LayoutTests/editing/deleting/smart-editing-disabled.html	(revision 124689)
>+++ LayoutTests/editing/deleting/smart-editing-disabled.html	(working copy)
>@@ -24,8 +24,8 @@ function editingTest() {
> <body>
> This test verifies that smart insert and delete can be disabled at test time.<br>
> If viewing in a browser, you should see the words "foo bar baz".<br>
>-If using a version of LayoutTestController with this functionality, you should see "foo  baz". (two spaces between the words)<br>
>-If using a version of LayoutTestController without this functionality, you should see "foo baz". (one space between the words)<br>
>+If using a version of testRunner with this functionality, you should see "foo  baz". (two spaces between the words)<br>
>+If using a version of testRunner without this functionality, you should see "foo baz". (one space between the words)<br>
> </div>
> </div>
> 
>Index: LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js	(working copy)
>@@ -10,7 +10,7 @@ if (window.testRunner) {
>                                                     mockLongitude,
>                                                     mockAccuracy);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var position;
> navigator.geolocation.getCurrentPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js	(working copy)
>@@ -4,7 +4,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(true);
>     testRunner.setMockGeolocationPosition(51.478, -0.166, 100);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> document.body.onload = function() {
>     navigator.geolocation.watchPosition(function() {});
>Index: LayoutTests/fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js	(working copy)
>@@ -6,7 +6,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(false);
>     testRunner.setMockGeolocationPosition(51.478, -0.166, 100);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var error;
> function onIframeLoaded() {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/error.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/error.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/error.js	(working copy)
>@@ -7,7 +7,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(true);
>     testRunner.setMockGeolocationError(mockCode, mockMessage);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var error;
> navigator.geolocation.getCurrentPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/maximum-age.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/maximum-age.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/maximum-age.js	(working copy)
>@@ -29,7 +29,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(true);
>     testRunner.setMockGeolocationPosition(mockLatitude, mockLongitude, mockAccuracy);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> // Initialize the cached Position
> navigator.geolocation.getCurrentPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/multiple-requests.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/multiple-requests.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/multiple-requests.js	(working copy)
>@@ -10,7 +10,7 @@ if (window.testRunner) {
>                                                     mockLongitude,
>                                                     mockAccuracy);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var watchCallbackInvoked = false;
> var oneShotCallbackInvoked = false;
>Index: LayoutTests/fast/dom/Geolocation/script-tests/no-page-cache.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/no-page-cache.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/no-page-cache.js	(working copy)
>@@ -5,7 +5,7 @@ if (window.testRunner) {
>     testRunner.setCanOpenWindows();
>     testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var pageOneOnloadCount = 0;
> function reportPageOneOnload() {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-clear-watch.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-clear-watch.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-clear-watch.js	(working copy)
>@@ -5,7 +5,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(false);
>     testRunner.setMockGeolocationPosition(51.478, -0.166, 100);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var error;
> navigator.geolocation.getCurrentPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js	(working copy)
>@@ -5,7 +5,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(false);
>     testRunner.setMockGeolocationPosition(51.478, -0.166, 100);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var error;
> navigator.geolocation.getCurrentPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-success.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-success.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-success.js	(working copy)
>@@ -5,7 +5,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(false);
>     testRunner.setMockGeolocationPosition(51.478, -0.166, 100);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var error;
> navigator.geolocation.getCurrentPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-stops-watches.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-stops-watches.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-stops-watches.js	(working copy)
>@@ -6,7 +6,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(false);
>     testRunner.setMockGeolocationPosition(51.478, -0.166, 100.0);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var error;
> var errorCallbackInvoked = false;
>Index: LayoutTests/fast/dom/Geolocation/script-tests/permission-denied.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/permission-denied.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/permission-denied.js	(working copy)
>@@ -4,7 +4,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(false);
>     testRunner.setMockGeolocationPosition(51.478, -0.166, 100.0);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var error;
> navigator.geolocation.getCurrentPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/position-string.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/position-string.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/position-string.js	(working copy)
>@@ -10,7 +10,7 @@ if (window.testRunner) {
>                                                     mockLongitude,
>                                                     mockAccuracy);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var position;
> navigator.geolocation.getCurrentPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/reentrant-error.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/reentrant-error.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/reentrant-error.js	(working copy)
>@@ -7,7 +7,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(true);
>     testRunner.setMockGeolocationError(mockCode, mockMessage);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var error;
> var errorCallbackInvoked = false;
>Index: LayoutTests/fast/dom/Geolocation/script-tests/reentrant-permission-denied.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/reentrant-permission-denied.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/reentrant-permission-denied.js	(working copy)
>@@ -4,7 +4,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(false);
>     testRunner.setMockGeolocationPosition(51.478, -0.166, 100.0);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var error;
> function checkPermissionError(e) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js	(working copy)
>@@ -10,7 +10,7 @@ if (window.testRunner) {
>                                                     mockLongitude,
>                                                     mockAccuracy);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var position;
> var successCallbackInvoked = false;
>Index: LayoutTests/fast/dom/Geolocation/script-tests/success.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/success.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/success.js	(working copy)
>@@ -10,7 +10,7 @@ if (window.testRunner) {
>                                                     mockLongitude,
>                                                     mockAccuracy);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var position;
> navigator.geolocation.getCurrentPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/timeout.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/timeout.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/timeout.js	(working copy)
>@@ -10,7 +10,7 @@ if (window.testRunner) {
>                                                     mockLongitude,
>                                                     mockAccuracy);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var position;
> navigator.geolocation.getCurrentPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/watch.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/watch.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/watch.js	(working copy)
>@@ -29,7 +29,7 @@ if (window.testRunner) {
>     testRunner.setGeolocationPermission(true);
>     testRunner.setMockGeolocationPosition(mockLatitude, mockLongitude, mockAccuracy);
> } else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> var state = 0;
> navigator.geolocation.watchPosition(function(p) {
>Index: LayoutTests/fast/dom/Geolocation/script-tests/window-close-crash.js
>===================================================================
>--- LayoutTests/fast/dom/Geolocation/script-tests/window-close-crash.js	(revision 124689)
>+++ LayoutTests/fast/dom/Geolocation/script-tests/window-close-crash.js	(working copy)
>@@ -9,7 +9,7 @@ if (window.testRunner) {
>     testRunner.setCanOpenWindows();
>     testRunner.setCloseRemainingWindowsWhenComplete(true);
> } else
>-    testFailed('This test can not be run without the LayoutTestController');
>+    testFailed('This test can not be run without the testRunner');
> 
> function gotPosition(p)
> {
>Index: LayoutTests/fast/encoding/resources/char-encoding-utils.js
>===================================================================
>--- LayoutTests/fast/encoding/resources/char-encoding-utils.js	(revision 124689)
>+++ LayoutTests/fast/encoding/resources/char-encoding-utils.js	(working copy)
>@@ -20,8 +20,8 @@ function testsDone()
> 
>     isSuccessfullyParsed();
> 
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> function processResult(result)
>Index: LayoutTests/fast/encoding/resources/dynamic-load-target.js
>===================================================================
>--- LayoutTests/fast/encoding/resources/dynamic-load-target.js	(revision 124689)
>+++ LayoutTests/fast/encoding/resources/dynamic-load-target.js	(working copy)
>@@ -5,5 +5,5 @@ if ('ã¨ãããã' == tokyo)
> else
>     document.getElementById("target").innerHTML = "FAIL: Incorrect encoding used.  Expected '" + tokyo + "' but got '" + 'ã¨ãããã' + "'.";
> 
>-if (window.layoutTestController) 
>-    window.layoutTestController.notifyDone();
>+if (window.testRunner) 
>+    window.testRunner.notifyDone();
>Index: LayoutTests/fast/encoding/resources/invalid-xml.js
>===================================================================
>--- LayoutTests/fast/encoding/resources/invalid-xml.js	(revision 124689)
>+++ LayoutTests/fast/encoding/resources/invalid-xml.js	(working copy)
>@@ -23,8 +23,8 @@ function runNextTest()
>     if (currentTest >= encodingTests.length) {
>         var script = document.createElement("script");
>         script.src = "../js/resources/js-test-post.js";
>-        if (window.layoutTestController)
>-            script.setAttribute("onload", "layoutTestController.notifyDone()");
>+        if (window.testRunner)
>+            script.setAttribute("onload", "testRunner.notifyDone()");
>         document.body.appendChild(script);
>         iframe.parentNode.removeChild(iframe);
>         return;
>@@ -32,8 +32,8 @@ function runNextTest()
>     iframe.src = "resources/" + encodingTests[currentTest++];
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner)
>+    testRunner.waitUntilDone();
> 
> var iframe = document.createElement("iframe");
> document.body.appendChild(iframe);
>Index: LayoutTests/fast/encoding/resources/parser-tests.js
>===================================================================
>--- LayoutTests/fast/encoding/resources/parser-tests.js	(revision 124689)
>+++ LayoutTests/fast/encoding/resources/parser-tests.js	(working copy)
>@@ -12,9 +12,9 @@ document.write('<p>This test suite was c
>   '<p>(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)</p>' +
>   '<p><iframe id="test"></iframe></p>');
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
> 
> var frame = document.getElementById('test');
>@@ -49,8 +49,8 @@ function dotest() {
>         else {
>             frame.parentNode.removeChild(frame);
>             document.getElementById('status').innerText = "Tests ran.";
>-            if (window.layoutTestController)
>-                layoutTestController.notifyDone();
>+            if (window.testRunner)
>+                testRunner.notifyDone();
>         }
>     };
> }
>Index: LayoutTests/fast/events/touch/script-tests/touch-slider-no-js-touch-listener.js
>===================================================================
>--- LayoutTests/fast/events/touch/script-tests/touch-slider-no-js-touch-listener.js	(revision 124689)
>+++ LayoutTests/fast/events/touch/script-tests/touch-slider-no-js-touch-listener.js	(working copy)
>@@ -23,7 +23,7 @@ var checkPosition = (function() {
> 
> function onKeyDown() {
>     checkPosition();
>-    layoutTestController.notifyDone();
>+    testRunner.notifyDone();
>     isSuccessfullyParsed();
> }
> 
>@@ -31,8 +31,8 @@ document.addEventListener('keydown', onK
> 
> description("Tests to ensure that touch events are delivered to an input element with type=range even when there are no touch event handlers in Javascript. This test is only expected to pass if ENABLE_TOUCH_SLIDER is defined.");
> 
>-if (window.layoutTestController) {
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
> }
> 
> if (window.eventSender) {
>Index: LayoutTests/fast/events/touch/script-tests/touch-slider.js
>===================================================================
>--- LayoutTests/fast/events/touch/script-tests/touch-slider.js	(revision 124689)
>+++ LayoutTests/fast/events/touch/script-tests/touch-slider.js	(working copy)
>@@ -46,7 +46,7 @@ function onTouchEnd() {
> 
> function onKeyDown() {
>     isSuccessfullyParsed();
>-    layoutTestController.notifyDone();
>+    testRunner.notifyDone();
> }
> 
> var sliderValue = 0;
>@@ -105,8 +105,8 @@ document.addEventListener("keydown", onK
> 
> description("Tests that the touch events originating on an input element with type=range update the slider position. This test is only expected to pass if ENABLE_TOUCH_SLIDER is defined.");
> 
>-if (window.layoutTestController) {
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
> }
> 
> if (window.eventSender) {
>Index: LayoutTests/fast/harness/override-preferences-2-expected.txt
>===================================================================
>--- LayoutTests/fast/harness/override-preferences-2-expected.txt	(revision 124689)
>+++ LayoutTests/fast/harness/override-preferences-2-expected.txt	(working copy)
>@@ -1,3 +1,3 @@
>-This test verifies that layoutTestController can have its default preferences overriden. This test verifies that the API will accept string values and also override the default font size. You should see "PASS" below.
>+This test verifies that testRunner can have its default preferences overriden. This test verifies that the API will accept string values and also override the default font size. You should see "PASS" below.
> 
> PASS
>Index: LayoutTests/fast/harness/override-preferences-2.html
>===================================================================
>--- LayoutTests/fast/harness/override-preferences-2.html	(revision 124689)
>+++ LayoutTests/fast/harness/override-preferences-2.html	(working copy)
>@@ -1,17 +1,17 @@
> <html>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.overridePreference("WebKitDefaultFontSize", "24");
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.overridePreference("WebKitDefaultFontSize", "24");
>     }
> </script>
> <body>
>-    <p>This test verifies that layoutTestController can have its default preferences overriden.
>+    <p>This test verifies that testRunner can have its default preferences overriden.
>     This test verifies that the API will accept string values and also override the default font size.
>     You should see "PASS" below.</p>
>     <script>
>         var p = document.getElementsByTagName("p")[0];
>-        if (!window.layoutTestController || window.getComputedStyle(p).fontSize == "24px")
>+        if (!window.testRunner || window.getComputedStyle(p).fontSize == "24px")
>             document.write("PASS");
>     </script>
> </body>
>Index: LayoutTests/fast/harness/override-preferences-expected.txt
>===================================================================
>--- LayoutTests/fast/harness/override-preferences-expected.txt	(revision 124689)
>+++ LayoutTests/fast/harness/override-preferences-expected.txt	(working copy)
>@@ -1,3 +1,3 @@
>-This is a test that verifies that layoutTestController can have its default preferences overridden. This test specifically checks that Javascript can be disabled, and you should see "PASS" below if viewing with a browser.
>+This is a test that verifies that testRunner can have its default preferences overridden. This test specifically checks that Javascript can be disabled, and you should see "PASS" below if viewing with a browser.
> 
> PASS
>Index: LayoutTests/fast/harness/override-preferences.html
>===================================================================
>--- LayoutTests/fast/harness/override-preferences.html	(revision 124689)
>+++ LayoutTests/fast/harness/override-preferences.html	(working copy)
>@@ -1,18 +1,18 @@
> <html>
> <body>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText()
>-        layoutTestController.overridePreference("WebKitJavaScriptEnabled", false);
>+    if (window.testRunner) {
>+        testRunner.dumpAsText()
>+        testRunner.overridePreference("WebKitJavaScriptEnabled", false);
>     }
> 
>     function loadstatus() {
>-        if (window.layoutTestController)
>+        if (window.testRunner)
>             document.getElementById("status").innerHTML = "FAIL";
>     }
> </script>
> <body onload="loadstatus()">
>-    <p>This is a test that verifies that layoutTestController can have its default preferences overridden.  This test specifically checks that Javascript can be disabled, and you should see "PASS" below if viewing with a browser.</p>
>+    <p>This is a test that verifies that testRunner can have its default preferences overridden.  This test specifically checks that Javascript can be disabled, and you should see "PASS" below if viewing with a browser.</p>
>     <span id="status">PASS</span>
> </body>
> </html>
>Index: LayoutTests/fast/harness/override-zzz-reset-expected.txt
>===================================================================
>--- LayoutTests/fast/harness/override-zzz-reset-expected.txt	(revision 124689)
>+++ LayoutTests/fast/harness/override-zzz-reset-expected.txt	(working copy)
>@@ -1,3 +1,3 @@
>-This test verifies that the layoutTestController will reset its default preferences after every layout test. You should see "PASS" below.
>+This test verifies that the testRunner will reset its default preferences after every layout test. You should see "PASS" below.
> 
> PASS
>Index: LayoutTests/fast/harness/override-zzz-reset.html
>===================================================================
>--- LayoutTests/fast/harness/override-zzz-reset.html	(revision 124689)
>+++ LayoutTests/fast/harness/override-zzz-reset.html	(working copy)
>@@ -1,11 +1,11 @@
> <html>
> <body>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <body>
>-    <p>This test verifies that the layoutTestController will reset its default preferences after every layout test.  You should see "PASS" below.</p>
>+    <p>This test verifies that the testRunner will reset its default preferences after every layout test.  You should see "PASS" below.</p>
>     <span id="status">FAIL</span>
>     <script>
>         document.getElementById("status").innerHTML = "PASS";
>Index: LayoutTests/fast/harness/use-page-cache-expected.txt
>===================================================================
>--- LayoutTests/fast/harness/use-page-cache-expected.txt	(revision 124689)
>+++ LayoutTests/fast/harness/use-page-cache-expected.txt	(working copy)
>@@ -1,4 +1,4 @@
>-This test uses layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1); to enable back-forward WebKit page cache for the duration of the test. The test enables cache, navigates to page-1, then to page-2 and then does history.back() to page-1. On navigation back to page-1, test verifies that previously-initialized timer continues to fire and onload is not called again. If test fails it hangs or outputs 'FAIL' below.
>+This test uses testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1); to enable back-forward WebKit page cache for the duration of the test. The test enables cache, navigates to page-1, then to page-2 and then does history.back() to page-1. On navigation back to page-1, test verifies that previously-initialized timer continues to fire and onload is not called again. If test fails it hangs or outputs 'FAIL' below.
> 
> open page-1
> page-1, about to navigate to page-2.
>Index: LayoutTests/fast/harness/use-page-cache.html
>===================================================================
>--- LayoutTests/fast/harness/use-page-cache.html	(revision 124689)
>+++ LayoutTests/fast/harness/use-page-cache.html	(working copy)
>@@ -2,8 +2,8 @@
> <script>
> window.finish = function()
> {
>-    if (layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (testRunner)
>+        testRunner.notifyDone();
> }
> 
> window.log = function(message) {
>@@ -23,11 +23,11 @@ window.reportOnload = function() {
> 
> function test()
> {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>-        layoutTestController.setCanOpenWindows();
>-        layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>+        testRunner.setCanOpenWindows();
>+        testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
>     }
>     log("open page-1");
>     window.open("resources/cached-page-1.html");
>@@ -35,7 +35,7 @@ function test()
> </script>
> 
> <body onload="test()">
>-<p>This test uses layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1); to enable
>+<p>This test uses testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1); to enable
> back-forward WebKit page cache for the duration of the test.
> The test enables cache, navigates to page-1, then to page-2 and then does history.back() to page-1.
> On navigation back to page-1, test verifies that previously-initialized timer continues to fire and
>Index: LayoutTests/fast/harness/resources/results-test.js
>===================================================================
>--- LayoutTests/fast/harness/resources/results-test.js	(revision 124689)
>+++ LayoutTests/fast/harness/resources/results-test.js	(working copy)
>@@ -1,7 +1,7 @@
> // To run these tests, load json_results.html in a browser.
> // You should see a series of PASS lines.
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> var testStyles = document.createElement('style');
> testStyles.innerText = ".test-pass { color: green; } .test-fail { color: red; }";
>Index: LayoutTests/fast/ruby/after-block-doesnt-crash.html-disabled
>===================================================================
>--- LayoutTests/fast/ruby/after-block-doesnt-crash.html-disabled	(revision 124689)
>+++ LayoutTests/fast/ruby/after-block-doesnt-crash.html-disabled	(working copy)
>@@ -17,7 +17,7 @@
>     </ruby>
> </ruby>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> This test passes if it doesn't crash.
>Index: LayoutTests/fast/ruby/after-table-doesnt-crash.html-disabled
>===================================================================
>--- LayoutTests/fast/ruby/after-table-doesnt-crash.html-disabled	(revision 124689)
>+++ LayoutTests/fast/ruby/after-table-doesnt-crash.html-disabled	(working copy)
>@@ -17,7 +17,7 @@
>     </ruby>
> </ruby>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> This test passes if it doesn't crash.
>Index: LayoutTests/fast/ruby/generated-after-counter-doesnt-crash.html-disabled
>===================================================================
>--- LayoutTests/fast/ruby/generated-after-counter-doesnt-crash.html-disabled	(revision 124689)
>+++ LayoutTests/fast/ruby/generated-after-counter-doesnt-crash.html-disabled	(working copy)
>@@ -1,7 +1,7 @@
> <html>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <style type="text/css">
> 
>Index: LayoutTests/fast/ruby/generated-before-and-after-counter-doesnt-crash.html-disabled
>===================================================================
>--- LayoutTests/fast/ruby/generated-before-and-after-counter-doesnt-crash.html-disabled	(revision 124689)
>+++ LayoutTests/fast/ruby/generated-before-and-after-counter-doesnt-crash.html-disabled	(working copy)
>@@ -1,7 +1,7 @@
> <html>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> <style type="text/css">
> 
>Index: LayoutTests/http/tests/eventsource/eventsource-events-after-close.html
>===================================================================
>--- LayoutTests/http/tests/eventsource/eventsource-events-after-close.html	(revision 124689)
>+++ LayoutTests/http/tests/eventsource/eventsource-events-after-close.html	(working copy)
>@@ -6,9 +6,9 @@
> </p>
> <pre id=log></pre>
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
> 
>     var log = document.getElementById("log");
>@@ -26,8 +26,8 @@
>             // Need to wait to see if we're called again.
>             // event-stream.php sends a bunch of events before flushing, so if close() didn't take
>             // effect we'd get a second message practically instantaneously, waiting 100ms should be ok.
>-            if (window.layoutTestController)
>-                layoutTestController.notifyDone();
>+            if (window.testRunner)
>+                testRunner.notifyDone();
>         }, 100);
>     }, false);
> 
>Index: LayoutTests/http/tests/misc/gmail-assert-on-load.html
>===================================================================
>--- LayoutTests/http/tests/misc/gmail-assert-on-load.html	(revision 124689)
>+++ LayoutTests/http/tests/misc/gmail-assert-on-load.html	(working copy)
>@@ -1,7 +1,7 @@
> <html>
> <script>
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
> }
> </script>
> <body>
>Index: LayoutTests/http/tests/misc/xhtml.php
>===================================================================
>--- LayoutTests/http/tests/misc/xhtml.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/xhtml.php	(working copy)
>@@ -1,8 +1,8 @@
> <html>
> <body>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> var accept = "<?php echo $_SERVER["HTTP_ACCEPT"]; ?>";
> document.write("Accept: " + accept + "<br><br>");
>Index: LayoutTests/http/tests/misc/xmltokenizer-do-not-crash.pl
>===================================================================
>--- LayoutTests/http/tests/misc/xmltokenizer-do-not-crash.pl	(revision 124689)
>+++ LayoutTests/http/tests/misc/xmltokenizer-do-not-crash.pl	(working copy)
>@@ -14,7 +14,7 @@ print "<!DOCTYPE html PUBLIC \"-//W3C//D
> print "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"pl\">\n";
> print "<head>\n";
> print "<script>\n";
>-print "if (window.layoutTestController) layoutTestController.dumpAsText();\n";
>+print "if (window.testRunner) testRunner.dumpAsText();\n";
> print "</script>";
> print "</head>\n";
> print "<body>\n";
>Index: LayoutTests/http/tests/misc/resources/char-encoding-in-hidden-charset-field.php
>===================================================================
>--- LayoutTests/http/tests/misc/resources/char-encoding-in-hidden-charset-field.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/char-encoding-in-hidden-charset-field.php	(working copy)
>@@ -26,8 +26,8 @@ echo "<p>PASSED: $data </p>";
> ?>
> 
> <script>
>-if(window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if(window.testRunner)
>+    testRunner.notifyDone();
> </script>
> 
> </body>
>Index: LayoutTests/http/tests/misc/resources/check-keygen-post.php
>===================================================================
>--- LayoutTests/http/tests/misc/resources/check-keygen-post.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/check-keygen-post.php	(working copy)
>@@ -15,8 +15,8 @@ function runTest()
>         r.innerHTML = "FAILURE: keygen was not parsed correctly. value=" +
>         o.nodeValue;
>         
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/http/tests/misc/resources/check-query-param.php
>===================================================================
>--- LayoutTests/http/tests/misc/resources/check-query-param.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/check-query-param.php	(working copy)
>@@ -15,8 +15,8 @@ function runTest()
>         r.innerHTML = "FAILURE: query param is not converted to UTF-8. value=" +
>         o.nodeValue;
>         
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> </script>
>Index: LayoutTests/http/tests/misc/resources/check-unnamed-file-included-in-formdata.php
>===================================================================
>--- LayoutTests/http/tests/misc/resources/check-unnamed-file-included-in-formdata.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/check-unnamed-file-included-in-formdata.php	(working copy)
>@@ -4,8 +4,8 @@ header("Content-Type: text/html; charset
> <html>
> <head>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> </script>
> </head>
> <body>
>Index: LayoutTests/http/tests/misc/resources/chromium-selectionAsMarkup.html
>===================================================================
>--- LayoutTests/http/tests/misc/resources/chromium-selectionAsMarkup.html	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/chromium-selectionAsMarkup.html	(working copy)
>@@ -16,7 +16,7 @@ onload = function() {
>     var range = document.createRange();
>     range.selectNodeContents(document.getElementById("selection"));
>     document.getSelection().addRange(range);
>-    var sel = layoutTestController.selectionAsMarkup();
>+    var sel = testRunner.selectionAsMarkup();
> 
>     var errors = "";
> 
>@@ -32,12 +32,12 @@ onload = function() {
>     else
>         document.body.innerText = errors;
> 
>-    layoutTestController.notifyDone();
>+    testRunner.notifyDone();
> }
> </script>
> 
> <p>
> This test makes sure that the markup used by print selection
> contains absolute urls and pushed down styles. This test depends
>-on layoutTestController.
>+on testRunner.
> </p>
>Index: LayoutTests/http/tests/misc/resources/delayed-log.php
>===================================================================
>--- LayoutTests/http/tests/misc/resources/delayed-log.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/delayed-log.php	(working copy)
>@@ -3,7 +3,7 @@
>   sleep($_GET["delay"]);
>   echo "log('" . $_GET["msg"] . "');\n";
>   if ($_GET["done"] == "1") {
>-      echo "if (window.layoutTestController)\n";
>-      echo "    layoutTestController.notifyDone();\n";
>+      echo "if (window.testRunner)\n";
>+      echo "    testRunner.notifyDone();\n";
>   }
> ?>
>Index: LayoutTests/http/tests/misc/resources/form-post-textplain.php
>===================================================================
>--- LayoutTests/http/tests/misc/resources/form-post-textplain.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/form-post-textplain.php	(working copy)
>@@ -19,8 +19,8 @@ if($data == "f1=This is field #1 &!@$%\n
> }
> ?>
> <script>
>-if(window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if(window.testRunner)
>+    testRunner.notifyDone();
> </script>
> </body>
> </html>
>Index: LayoutTests/http/tests/misc/resources/location-test-xsl-style-sheet.xsl
>===================================================================
>--- LayoutTests/http/tests/misc/resources/location-test-xsl-style-sheet.xsl	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/location-test-xsl-style-sheet.xsl	(working copy)
>@@ -15,8 +15,8 @@
>             else
>                 document.getElementById("pass").innerHTML = "<span>PASS</span>";
> 
>-            if (window.layoutTestController)
>-                layoutTestController.dumpAsText();
>+            if (window.testRunner)
>+                testRunner.dumpAsText();
>         }
> 
>      </script>
>Index: LayoutTests/http/tests/misc/resources/percent-sign-in-form-data-field-name.cgi
>===================================================================
>--- LayoutTests/http/tests/misc/resources/percent-sign-in-form-data-field-name.cgi	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/percent-sign-in-form-data-field-name.cgi	(working copy)
>@@ -19,8 +19,8 @@ print "if (pre.textContent.match('abc%40
> print "  document.write('PASS')\n";
> print "else\n";
> print "  document.write('FAIL')\n";
>-print "if (window.layoutTestController) {\n";
>+print "if (window.testRunner) {\n";
> print "  pre.setAttribute('style', 'display:none');\n";
>-print "  layoutTestController.notifyDone();\n";
>+print "  testRunner.notifyDone();\n";
> print "}\n";
> print "</script>\n";
>Index: LayoutTests/http/tests/misc/resources/post-echo-and-notify-done.cgi
>===================================================================
>--- LayoutTests/http/tests/misc/resources/post-echo-and-notify-done.cgi	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/post-echo-and-notify-done.cgi	(working copy)
>@@ -6,7 +6,7 @@ if ($ENV{'REQUEST_METHOD'} eq "POST") {
>     read(STDIN, $request, $ENV{'CONTENT_LENGTH'})
>                 || die "Could not get query\n";
>     print $request;
>-    print "<script>if (window.layoutTestController) layoutTestController.notifyDone();</script>";
>+    print "<script>if (window.testRunner) testRunner.notifyDone();</script>";
> } else {
>     print "Wrong method: " . $ENV{'REQUEST_METHOD'} . "\n";
> } 
>Index: LayoutTests/http/tests/misc/resources/prefetch-purpose.php
>===================================================================
>--- LayoutTests/http/tests/misc/resources/prefetch-purpose.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/prefetch-purpose.php	(working copy)
>@@ -11,7 +11,7 @@ if (isset($_COOKIE['Purpose'])) {
> ?>
> 
> <script>
>-layoutTestController.notifyDone();
>+testRunner.notifyDone();
> </script>
> 
> <p>This test verifies that prefetches are sent with the HTTP request header
>Index: LayoutTests/http/tests/misc/resources/redirect-result.php
>===================================================================
>--- LayoutTests/http/tests/misc/resources/redirect-result.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/redirect-result.php	(working copy)
>@@ -1,8 +1,8 @@
> <html>
> <body>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> var userAgent = "<?php echo $_SERVER['HTTP_USER_AGENT']; ?>";
> if (userAgent.match(/WebKit/)) {
>Index: LayoutTests/http/tests/misc/resources/referrer-main-resource.php
>===================================================================
>--- LayoutTests/http/tests/misc/resources/referrer-main-resource.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/referrer-main-resource.php	(working copy)
>@@ -3,8 +3,8 @@
> <script>
> function runTest() {
> 
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> 
>     <?php if (isset($_SERVER['HTTP_REFERER']))
>               echo 'document.write("FAIL: The server should not receive a referrer which is not set by user agent.");';
>Index: LayoutTests/http/tests/misc/resources/referrer-result.php
>===================================================================
>--- LayoutTests/http/tests/misc/resources/referrer-result.php	(revision 124689)
>+++ LayoutTests/http/tests/misc/resources/referrer-result.php	(working copy)
>@@ -9,8 +9,8 @@ if (referer.match(/referrer.html/)) {
>     document.write("FAIL: Referer header does not contain the string 'referrer.html', value is '" + referer + "'");
> }
> 
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
> </script>
> 
> </body>
>Index: LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php
>===================================================================
>--- LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php	(revision 124689)
>+++ LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php	(working copy)
>@@ -7,8 +7,8 @@ echo str_pad('', 5000);
> ?>
> 
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> 
> <?php
>Index: LayoutTests/http/tests/multipart/policy-ignore-crash.php
>===================================================================
>--- LayoutTests/http/tests/multipart/policy-ignore-crash.php	(revision 124689)
>+++ LayoutTests/http/tests/multipart/policy-ignore-crash.php	(working copy)
>@@ -5,8 +5,8 @@ Content-type: text/html
> 
> <p>This test passes if it does not crash.</p>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> </script>
> 
> <?php
>Index: LayoutTests/http/tests/multipart/win-boundary-crash.html-disabled
>===================================================================
>--- LayoutTests/http/tests/multipart/win-boundary-crash.html-disabled	(revision 124689)
>+++ LayoutTests/http/tests/multipart/win-boundary-crash.html-disabled	(working copy)
>@@ -1,8 +1,8 @@
> <html>
> <head>
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> </head>
> <body>
>Index: LayoutTests/http/tests/navigation/post-goback-repost-policy.html-disabled
>===================================================================
>--- LayoutTests/http/tests/navigation/post-goback-repost-policy.html-disabled	(revision 124689)
>+++ LayoutTests/http/tests/navigation/post-goback-repost-policy.html-disabled	(working copy)
>@@ -2,9 +2,9 @@
> <head>
> <script>
>     
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
> }
>     
> function loaded()
>Index: LayoutTests/http/tests/navigation/useragent.php
>===================================================================
>--- LayoutTests/http/tests/navigation/useragent.php	(revision 124689)
>+++ LayoutTests/http/tests/navigation/useragent.php	(working copy)
>@@ -4,8 +4,8 @@
> <p>Tests for user agent string template</p>
> 
> <script>
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>     }
> 
>     var userAgent = navigator.userAgent;
>Index: LayoutTests/http/tests/navigation/resources/back-send-referrer-helper.php
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/back-send-referrer-helper.php	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/back-send-referrer-helper.php	(working copy)
>@@ -23,8 +23,8 @@ window.name: <script>document.write(wind
>     } else if (window.name == 2) {
>         history.go(-1);
>     } else {
>-        if (window.layoutTestController)
>-            window.layoutTestController.notifyDone();
>+        if (window.testRunner)
>+            window.testRunner.notifyDone();
>     }
> </script>
> 
>Index: LayoutTests/http/tests/navigation/resources/check-ping.php
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/check-ping.php	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/check-ping.php	(working copy)
>@@ -15,8 +15,8 @@ while ($line = fgets($pingFile)) {
> fclose($pingFile);
> unlink("ping.txt");
> echo "<script>";
>-echo "if (window.layoutTestController)";
>-echo "    layoutTestController.notifyDone();";
>+echo "if (window.testRunner)";
>+echo "    testRunner.notifyDone();";
> echo "</script>";
> echo "</body></html>";
> ?>
>Index: LayoutTests/http/tests/navigation/resources/document-location.js
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/document-location.js	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/document-location.js	(working copy)
>@@ -1,17 +1,17 @@
> function start() {
>-  if (window.layoutTestController) {
>+  if (window.testRunner) {
>     var n = document.location.search.substring(1);
>     if (!n) {
>       // page just opened
>-      layoutTestController.dumpBackForwardList();
>-      layoutTestController.dumpAsText();
>-      layoutTestController.waitUntilDone();
>+      testRunner.dumpBackForwardList();
>+      testRunner.dumpAsText();
>+      testRunner.waitUntilDone();
> 
>       // Location changes need to happen outside the onload handler to generate history entries.
>       setTimeout(runTest, 0);
>     } else {
>       // loaded the ?1 navigation
>-      layoutTestController.notifyDone();
>+      testRunner.notifyDone();
>     }
>   }
> }
>Index: LayoutTests/http/tests/navigation/resources/form-target.pl
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/form-target.pl	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/form-target.pl	(working copy)
>@@ -51,8 +51,8 @@ if (sessionStorage.topShouldNavAndGoBack
>   }
> }
> 
>-if (isDone && window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (isDone && window.testRunner)
>+    testRunner.notifyDone();
> 
> </script>
> </body>
>Index: LayoutTests/http/tests/navigation/resources/goback-with-policydelegate.php
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/goback-with-policydelegate.php	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/goback-with-policydelegate.php	(working copy)
>@@ -4,8 +4,8 @@
> 
> function loaded()
> {
>-    if (window.layoutTestController)
>-        layoutTestController.setCustomPolicyDelegate(true, true);
>+    if (window.testRunner)
>+        testRunner.setCustomPolicyDelegate(true, true);
> 
>     window.history.back();
> }
>Index: LayoutTests/http/tests/navigation/resources/no-referrer-helper.php
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/no-referrer-helper.php	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/no-referrer-helper.php	(working copy)
>@@ -24,8 +24,8 @@ function log(msg)
>         consoleWindow.log("window.opener: " + (window.opener ? window.opener.location : ""));
>     }
>     
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> </script>
> 
> </body></html>
>Index: LayoutTests/http/tests/navigation/resources/no-referrer-same-window-helper.php
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/no-referrer-same-window-helper.php	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/no-referrer-same-window-helper.php	(working copy)
>@@ -8,12 +8,12 @@
> The Referrer displayed below should be empty.<br/>
> <div id="referrer">Referrer: <?php echo $_SERVER['HTTP_REFERER']; ?></div>
> <div id="console"></div>
>-<script>
>-    var line = document.createElement('div');
>-    line.appendChild(document.createTextNode(document.getElementById("referrer").innerText == "Referrer:" ? "PASS" : "FAIL"));
>+<script>
>+    var line = document.createElement('div');
>+    line.appendChild(document.createTextNode(document.getElementById("referrer").innerText == "Referrer:" ? "PASS" : "FAIL"));
>     document.getElementById('console').appendChild(line);
>     
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> </script>
> </body></html>
>Index: LayoutTests/http/tests/navigation/resources/notify-done.html
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/notify-done.html	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/notify-done.html	(working copy)
>@@ -1,8 +1,8 @@
> <html>
> <script>
>-if (window.layoutTestController)
>-    layoutTestController.notifyDone();
>+if (window.testRunner)
>+    testRunner.notifyDone();
> </script>
> <body>
>-This page calls layoutTestController.notifyDone().
>+This page calls testRunner.notifyDone().
> </html>
>Index: LayoutTests/http/tests/navigation/resources/post-target-policy-test.php
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/post-target-policy-test.php	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/post-target-policy-test.php	(working copy)
>@@ -6,9 +6,9 @@ function loaded()
> {
>     if (window.sessionStorage.getItem("postedForm")) {
>         window.sessionStorage.removeItem("postedForm");
>-        if (window.layoutTestController) {
>-            layoutTestController.setCustomPolicyDelegate(false);
>-            layoutTestController.notifyDone();
>+        if (window.testRunner) {
>+            testRunner.setCustomPolicyDelegate(false);
>+            testRunner.notifyDone();
>         }
>         return;
>     }
>Index: LayoutTests/http/tests/navigation/resources/redirect302-metaredirect.pl
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/redirect302-metaredirect.pl	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/redirect302-metaredirect.pl	(working copy)
>@@ -9,8 +9,8 @@ print <<HERE_DOC_END
> <html>
> <meta http-equiv="refresh" content="0;URL=redirect302-metaredirect.html">
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner)
>+        testRunner.waitUntilDone();
> </script>
> <body>
> Test failed! - This page uses a meta redirect to load another page.
>Index: LayoutTests/http/tests/navigation/resources/redirect-cycle-1.pl
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/redirect-cycle-1.pl	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/redirect-cycle-1.pl	(working copy)
>@@ -32,7 +32,7 @@ if ($count eq 1) {
>     print "<html>";
>     print "<head>";
>     print "<script type='text/javascript'>";
>-    print "function startTest() { layoutTestController.dumpBackForwardList(); }";
>+    print "function startTest() { testRunner.dumpBackForwardList(); }";
>     print "</script>";
>     print "</head>";
>     print "<body onload='startTest();'>";
>Index: LayoutTests/http/tests/navigation/resources/redirected-post-request-contents.php
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/redirected-post-request-contents.php	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/redirected-post-request-contents.php	(working copy)
>@@ -34,5 +34,5 @@ if (sizeof($_POST) > 0 || sizeof($_FILES
>     echo "no POST data is present.<br>";
> }
> 
>-echo "<script>if (window.layoutTestController) layoutTestController.notifyDone();</script>"
>+echo "<script>if (window.testRunner) testRunner.notifyDone();</script>"
> ?>
>Index: LayoutTests/http/tests/navigation/resources/submit-to-fragment.pl
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/submit-to-fragment.pl	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/submit-to-fragment.pl	(working copy)
>@@ -30,8 +30,8 @@ onload = function() {
>     break;
>   case 3:
>     document.getElementById("result").innerText = "PASS";
>-    if (window.layoutTestController)
>-      layoutTestController.notifyDone();
>+    if (window.testRunner)
>+      testRunner.notifyDone();
>     break;
>   }
> }
>Index: LayoutTests/http/tests/navigation/resources/testcode.js
>===================================================================
>--- LayoutTests/http/tests/navigation/resources/testcode.js	(revision 124689)
>+++ LayoutTests/http/tests/navigation/resources/testcode.js	(working copy)
>@@ -62,17 +62,17 @@ function jumpToAnchor() {
> // it's important to check that that we end up scrolled to the right place,
> // proving the anchor was visited.
> function runBasicTest(testCase, extraStep) {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpBackForwardList();
>-        layoutTestController.queueLoad(testCase);
>+    if (window.testRunner) {
>+        testRunner.dumpBackForwardList();
>+        testRunner.queueLoad(testCase);
>         if (extraStep == "post") {
>-            layoutTestController.queueNonLoadingScript("fillTestForm()");
>-            layoutTestController.queueLoadingScript("submitFormWithPost()");
>+            testRunner.queueNonLoadingScript("fillTestForm()");
>+            testRunner.queueLoadingScript("submitFormWithPost()");
>         } else if (extraStep == "postredirect") {
>-            layoutTestController.queueNonLoadingScript("fillTestForm()");
>-            layoutTestController.queueLoadingScript("submitFormWithPostRedirect()");
>+            testRunner.queueNonLoadingScript("fillTestForm()");
>+            testRunner.queueLoadingScript("submitFormWithPostRedirect()");
>         } else if (extraStep == "relativeanchor") {
>-            layoutTestController.queueNonLoadingScript("jumpToAnchor()");
>+            testRunner.queueNonLoadingScript("jumpToAnchor()");
>         }
>     }
> }
>@@ -88,30 +88,30 @@ function runBasicTest(testCase, extraSte
> // When we POST it is interesting to test going back to the post result,
> // and going back 2 pages to the original form.
> function runBackTest(testCase, howFarBack, extraStep) {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpBackForwardList();
>-        layoutTestController.queueLoad(testCase);
>-        layoutTestController.queueNonLoadingScript("fillTestForm()");
>-        layoutTestController.queueNonLoadingScript("scrollDocDown()");
>+    if (window.testRunner) {
>+        testRunner.dumpBackForwardList();
>+        testRunner.queueLoad(testCase);
>+        testRunner.queueNonLoadingScript("fillTestForm()");
>+        testRunner.queueNonLoadingScript("scrollDocDown()");
>         if (extraStep == "post") {
>-            layoutTestController.queueLoadingScript("submitFormWithPost()");
>+            testRunner.queueLoadingScript("submitFormWithPost()");
>         } else if (extraStep == "postredirect") {
>-            layoutTestController.queueLoadingScript("submitFormWithPostRedirect()");
>+            testRunner.queueLoadingScript("submitFormWithPostRedirect()");
>         } else if (extraStep == "relativeanchor") {
>-            layoutTestController.queueNonLoadingScript("jumpToAnchor()");
>+            testRunner.queueNonLoadingScript("jumpToAnchor()");
>         }
>-        layoutTestController.queueLoad("resources/otherpage.html");
>-        layoutTestController.queueBackNavigation(howFarBack);
>+        testRunner.queueLoad("resources/otherpage.html");
>+        testRunner.queueBackNavigation(howFarBack);
>     }
> }
> 
> // A sequence testing frames, where the given nav technique is used to
> // load a single child frame, after the load of the whole frameset.
> function runLoadChildFrameTest(testCase) {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpBackForwardList();
>-        layoutTestController.queueLoad("resources/frameset.pl?frameURL=otherpage.html");
>-        layoutTestController.queueLoad(testCase, "main");
>+    if (window.testRunner) {
>+        testRunner.dumpBackForwardList();
>+        testRunner.queueLoad("resources/frameset.pl?frameURL=otherpage.html");
>+        testRunner.queueLoad(testCase, "main");
>     }
> }
> 
>@@ -120,14 +120,14 @@ function runLoadChildFrameTest(testCase)
> // state save/restore.  Some browsers do not let you restablish the
> // set of subframes you were viewing when you go back in a case like this.
> function runLoadChildFrameBackTest(testCase) {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpBackForwardList();
>-        layoutTestController.queueLoad("resources/frameset.pl?frameURL=otherpage.html");
>-        layoutTestController.queueLoad(testCase, "main");
>-        layoutTestController.queueNonLoadingScript("fillTestForm()");
>-        layoutTestController.queueNonLoadingScript("scrollDocDown()");
>-        layoutTestController.queueLoad("resources/otherpage.html");
>-        layoutTestController.queueBackNavigation(1);
>+    if (window.testRunner) {
>+        testRunner.dumpBackForwardList();
>+        testRunner.queueLoad("resources/frameset.pl?frameURL=otherpage.html");
>+        testRunner.queueLoad(testCase, "main");
>+        testRunner.queueNonLoadingScript("fillTestForm()");
>+        testRunner.queueNonLoadingScript("scrollDocDown()");
>+        testRunner.queueLoad("resources/otherpage.html");
>+        testRunner.queueBackNavigation(1);
>     }
> }
> 
>@@ -135,12 +135,12 @@ function runLoadChildFrameBackTest(testC
> // A sequence testing reload.  The goals are that form state is cleared,
> // scroll state is restored, and nothing is added to b/f list.
> function runReloadTest(testCase) {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpBackForwardList();
>-        layoutTestController.queueLoad(testCase);
>-        layoutTestController.queueNonLoadingScript("fillTestForm()");
>-        layoutTestController.queueNonLoadingScript("scrollDocDown()");
>-        layoutTestController.queueReload();
>+    if (window.testRunner) {
>+        testRunner.dumpBackForwardList();
>+        testRunner.queueLoad(testCase);
>+        testRunner.queueNonLoadingScript("fillTestForm()");
>+        testRunner.queueNonLoadingScript("scrollDocDown()");
>+        testRunner.queueReload();
>     }
> }
> 
>@@ -149,19 +149,19 @@ function runReloadTest(testCase) {
> // that this case should not preserve scroll state or form state, and not add
> // anything to the b/f list.
> function runLoadSameTest(testCase) {
>-    layoutTestController.dumpBackForwardList();
>-    layoutTestController.queueLoad(testCase);
>-    layoutTestController.queueNonLoadingScript("fillTestForm()");
>-    layoutTestController.queueNonLoadingScript("scrollDocDown()");
>-    layoutTestController.queueLoad(testCase);
>+    testRunner.dumpBackForwardList();
>+    testRunner.queueLoad(testCase);
>+    testRunner.queueNonLoadingScript("fillTestForm()");
>+    testRunner.queueNonLoadingScript("scrollDocDown()");
>+    testRunner.queueLoad(testCase);
> }
> 
> // A sequence testing a reload after a redirect. The goal is to check
> // that in a reload we use the method set by the redirect, GET,
> // instead of the original one, POST.
> function runRedirectReloadTest(testCase) {
>-    layoutTestController.dumpBackForwardList();
>-    layoutTestController.queueLoad(testCase);
>-    layoutTestController.queueLoadingScript("submitFormWithPostRedirectReload()");
>-    layoutTestController.queueReload();
>+    testRunner.dumpBackForwardList();
>+    testRunner.queueLoad(testCase);
>+    testRunner.queueLoadingScript("submitFormWithPostRedirectReload()");
>+    testRunner.queueReload();
> }
>Index: LayoutTests/http/tests/resources/js-test-post.js
>===================================================================
>--- LayoutTests/http/tests/resources/js-test-post.js	(revision 124689)
>+++ LayoutTests/http/tests/resources/js-test-post.js	(working copy)
>@@ -1,8 +1,8 @@
> wasPostTestScriptParsed = true;
> 
> if (window.jsTestIsAsync) {
>-    if (window.layoutTestController)
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner)
>+        testRunner.waitUntilDone();
>     if (window.wasFinishJSTestCalled)
>         finishJSTest();
> } else
>Index: LayoutTests/http/tests/resources/js-test-pre.js
>===================================================================
>--- LayoutTests/http/tests/resources/js-test-pre.js	(revision 124689)
>+++ LayoutTests/http/tests/resources/js-test-pre.js	(working copy)
>@@ -1,6 +1,6 @@
> // svg/dynamic-updates tests set enablePixelTesting=true, as we want to dump text + pixel results
>-if (self.layoutTestController)
>-    layoutTestController.dumpAsText(self.enablePixelTesting);
>+if (self.testRunner)
>+    testRunner.dumpAsText(self.enablePixelTesting);
> 
> var description, debug, successfullyParsed, errorMessage;
> 
>@@ -466,8 +466,8 @@ function finishJSTest()
>     if (!self.wasPostTestScriptParsed)
>         return;
>     isSuccessfullyParsed();
>-    if (self.jsTestIsAsync && self.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (self.jsTestIsAsync && self.testRunner)
>+        testRunner.notifyDone();
> }
> 
> function startWorker(testScriptURL, shared)
>Index: LayoutTests/http/tests/security/contentSecurityPolicy/resources/securitypolicy-tests-base.js
>===================================================================
>--- LayoutTests/http/tests/security/contentSecurityPolicy/resources/securitypolicy-tests-base.js	(revision 124689)
>+++ LayoutTests/http/tests/security/contentSecurityPolicy/resources/securitypolicy-tests-base.js	(working copy)
>@@ -1,5 +1,5 @@
>-if (window.layoutTestController)
>-    layoutTestController.dumpAsText();
>+if (window.testRunner)
>+    testRunner.dumpAsText();
> 
> function log(msg) {
>     var txt = document.createTextNode(msg);
>Index: LayoutTests/http/tests/ssl/verify-ssl-enabled.php
>===================================================================
>--- LayoutTests/http/tests/ssl/verify-ssl-enabled.php	(revision 124689)
>+++ LayoutTests/http/tests/ssl/verify-ssl-enabled.php	(working copy)
>@@ -1,6 +1,6 @@
> <script>
>-    if (window.layoutTestController)
>-        layoutTestController.dumpAsText();
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
> </script>
> 
> HTTPS is <?= $_SERVER['HTTPS'] ?>!
>Index: LayoutTests/http/tests/ssl/resources/no-http-referer.cgi
>===================================================================
>--- LayoutTests/http/tests/ssl/resources/no-http-referer.cgi	(revision 124689)
>+++ LayoutTests/http/tests/ssl/resources/no-http-referer.cgi	(working copy)
>@@ -15,4 +15,4 @@ if (!$failed) {
>     print "PASS\n";
> }
> 
>-print "<script>if (window.layoutTestController) layoutTestController.notifyDone()</script>";
>+print "<script>if (window.testRunner) testRunner.notifyDone()</script>";
>Index: LayoutTests/networkinformation/script-tests/event-after-navigation.js
>===================================================================
>--- LayoutTests/networkinformation/script-tests/event-after-navigation.js	(revision 124689)
>+++ LayoutTests/networkinformation/script-tests/event-after-navigation.js	(working copy)
>@@ -3,7 +3,7 @@ description('Tests for a crash where an 
> if (window.testRunner)
>     testRunner.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
> else
>-    debug('This test can not be run without the LayoutTestController');
>+    debug('This test can not be run without the testRunner');
> 
> document.body.onload = function() {
>     navigator.webkitConnection.addEventListener('webkitnetworkinfochange', function() { } );
>Index: LayoutTests/platform/mac/fast/objc/script-tests/webScriptObject-hasWebScriptKey.js
>===================================================================
>--- LayoutTests/platform/mac/fast/objc/script-tests/webScriptObject-hasWebScriptKey.js	(revision 124689)
>+++ LayoutTests/platform/mac/fast/objc/script-tests/webScriptObject-hasWebScriptKey.js	(working copy)
>@@ -33,8 +33,8 @@ function runTestsOnObject(objectParam) {
>     debug("");
> }
> 
>-if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
> 
>     debug("Test with a newly created, local, object => {}");
>     runTestsOnObject({});
>Index: LayoutTests/platform/qt/svg/repaint/filter-repaint-expected.txt
>===================================================================
>--- LayoutTests/platform/qt/svg/repaint/filter-repaint-expected.txt	(revision 124689)
>+++ LayoutTests/platform/qt/svg/repaint/filter-repaint-expected.txt	(working copy)
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 6: TypeError: 'undefined' is not a function (evaluating 'layoutTestController.testRepaint()')
>+CONSOLE MESSAGE: line 6: TypeError: 'undefined' is not a function (evaluating 'testRunner.testRepaint()')
> layer at (0,0) size 800x600
>   RenderView at (0,0) size 800x600
> layer at (0,0) size 400x400
>Index: LayoutTests/transforms/3d/hit-testing/resources/hit-test-utils.js
>===================================================================
>--- LayoutTests/transforms/3d/hit-testing/resources/hit-test-utils.js	(revision 124689)
>+++ LayoutTests/transforms/3d/hit-testing/resources/hit-test-utils.js	(working copy)
>@@ -1,5 +1,5 @@
>-if (window.layoutTestController)
>-  layoutTestController.dumpAsText();
>+if (window.testRunner)
>+  testRunner.dumpAsText();
> 
> function log(s)
> {
>Index: LayoutTests/transforms/3d/point-mapping/point-mapping-helpers.js
>===================================================================
>--- LayoutTests/transforms/3d/point-mapping/point-mapping-helpers.js	(revision 124689)
>+++ LayoutTests/transforms/3d/point-mapping/point-mapping-helpers.js	(working copy)
>@@ -1,6 +1,6 @@
> 
>-if (window.layoutTestController)
>-    layoutTestController.waitUntilDone();
>+if (window.testRunner)
>+    testRunner.waitUntilDone();
> 
> function mousemoved(e)
> {
>@@ -45,14 +45,14 @@ function log(s)
> function runTest()
> {
>     // In non-test mode, show the mouse coords for testing
>-    if (window.layoutTestController)
>+    if (window.testRunner)
>       document.getElementById('mousepos').style.display = 'none';
>     else
>       document.body.addEventListener('mousemove', mousemoved, false);
> 
>     test();
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> window.addEventListener('load', function() {
>Index: LayoutTests/transitions/transition-end-event-helpers.js
>===================================================================
>--- LayoutTests/transitions/transition-end-event-helpers.js	(revision 124689)
>+++ LayoutTests/transitions/transition-end-event-helpers.js	(working copy)
>@@ -49,9 +49,9 @@ function runTransitionTest(expected, cal
> {
>   _expectedEventCount = expected.length;
> 
>-  if (window.layoutTestController) {
>-    layoutTestController.dumpAsText();
>-    layoutTestController.waitUntilDone();
>+  if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
>   }
>   
>   function processEndEvents(expected)
>@@ -130,8 +130,8 @@ function runTransitionTest(expected, cal
>     document.body.removeChild(document.getElementById('container'));
>     document.getElementById('result').innerHTML = examineResults(_recordedEvents, expected);
> 
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
>   }
> 
>   function startTest(expected, callback, maxTime)
>Index: LayoutTests/transitions/resources/transition-test-helpers.js
>===================================================================
>--- LayoutTests/transitions/resources/transition-test-helpers.js	(revision 124689)
>+++ LayoutTests/transitions/resources/transition-test-helpers.js	(working copy)
>@@ -209,8 +209,8 @@ function endTest()
> {
>     document.getElementById('result').innerHTML = result;
> 
>-    if (window.layoutTestController)
>-        layoutTestController.notifyDone();
>+    if (window.testRunner)
>+        testRunner.notifyDone();
> }
> 
> function checkExpectedValueCallback(expected, index)
>@@ -235,7 +235,7 @@ function runTest(expected, usePauseAPI)
>         // We can only use the transition fast-forward mechanism if DRT implements pauseTransitionAtTimeOnElementWithId()
>         if (hasPauseTransitionAPI && usePauseAPI) {
>             if (tryToPauseTransition) {
>-              if (!layoutTestController.pauseTransitionAtTimeOnElementWithId(property, time, elementId))
>+              if (!testRunner.pauseTransitionAtTimeOnElementWithId(property, time, elementId))
>                 window.console.log("Failed to pause '" + property + "' transition on element '" + elementId + "'");
>             }
>             checkExpectedValue(expected, i);
>@@ -280,12 +280,12 @@ var hasPauseTransitionAPI;
> 
> function runTransitionTest(expected, callback, usePauseAPI, doPixelTest)
> {
>-    hasPauseTransitionAPI = ('layoutTestController' in window) && ('pauseTransitionAtTimeOnElementWithId' in layoutTestController);
>+    hasPauseTransitionAPI = ('testRunner' in window) && ('pauseTransitionAtTimeOnElementWithId' in testRunner);
>     
>-    if (window.layoutTestController) {
>+    if (window.testRunner) {
>         if (!doPixelTest)
>-            layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+            testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
>     
>     if (!expected)
>Index: LayoutTests/webaudio/resources/audio-codec-test.js
>===================================================================
>--- LayoutTests/webaudio/resources/audio-codec-test.js	(revision 124689)
>+++ LayoutTests/webaudio/resources/audio-codec-test.js	(working copy)
>@@ -8,7 +8,7 @@ var bufferLoader = 0;
> // select a context with a different sample rate.  The default value is |defaultSampleRate|.
> function runDecodingTest(url, optionalSampleRate) 
> {
>-    if (!window.layoutTestController)
>+    if (!window.testRunner)
>         return;
> 
>     var sampleRate = (typeof optionalSampleRate === "undefined") ? defaultSampleRate : optionalSampleRate;
>@@ -23,12 +23,12 @@ function runDecodingTest(url, optionalSa
>     );
>     
>     bufferLoader.load();
>-    layoutTestController.waitUntilDone();
>+    testRunner.waitUntilDone();
> }
> 
> function finishedLoading(bufferList)
> {
>-    layoutTestController.setAudioData(createAudioData(bufferList[0]));
>-    layoutTestController.notifyDone();
>+    testRunner.setAudioData(createAudioData(bufferList[0]));
>+    testRunner.notifyDone();
> }
> 
>Index: LayoutTests/webaudio/resources/audio-testing.js
>===================================================================
>--- LayoutTests/webaudio/resources/audio-testing.js	(revision 124689)
>+++ LayoutTests/webaudio/resources/audio-testing.js	(working copy)
>@@ -1,5 +1,5 @@
>-if (window.layoutTestController)
>-    layoutTestController.overridePreference("WebKitWebAudioEnabled", "1");
>+if (window.testRunner)
>+    testRunner.overridePreference("WebKitWebAudioEnabled", "1");
> 
> function writeString(s, a, offset) {
>     for (var i = 0; i < s.length; ++i) {
>@@ -97,8 +97,8 @@ function createAudioData(audioBuffer) {
> 
> function finishAudioTest(event) {
>     var audioData = createAudioData(event.renderedBuffer);
>-    layoutTestController.setAudioData(audioData);
>-    layoutTestController.notifyDone();
>+    testRunner.setAudioData(audioData);
>+    testRunner.notifyDone();
> }
> 
> // Create an impulse in a buffer of length sampleFrameLength
>Index: LayoutTests/webaudio/resources/audioparam-testing.js
>===================================================================
>--- LayoutTests/webaudio/resources/audioparam-testing.js	(revision 124689)
>+++ LayoutTests/webaudio/resources/audioparam-testing.js	(working copy)
>@@ -397,9 +397,9 @@ function doAutomation(numberOfTests, ini
> //
> function createAudioGraphAndTest(numberOfTests, initialValue, setValueFunction, automationFunction, testName, maxError, referenceFunction, jumpThreshold)
> {
>-    if (window.layoutTestController) {
>-        layoutTestController.dumpAsText();
>-        layoutTestController.waitUntilDone();
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>     }
> 
>     window.jsTestIsAsync = true;
>Index: LayoutTests/webaudio/resources/oscillator-testing.js
>===================================================================
>--- LayoutTests/webaudio/resources/oscillator-testing.js	(revision 124689)
>+++ LayoutTests/webaudio/resources/oscillator-testing.js	(working copy)
>@@ -56,5 +56,5 @@ function generateExponentialOscillatorSw
>     context.oncomplete = finishAudioTest;
>     context.startRendering();    
> 
>-    layoutTestController.waitUntilDone();
>+    testRunner.waitUntilDone();
> }
>Index: LayoutTests/webintents/resources/web-intents-testing.js
>===================================================================
>--- LayoutTests/webintents/resources/web-intents-testing.js	(revision 124689)
>+++ LayoutTests/webintents/resources/web-intents-testing.js	(working copy)
>@@ -2,8 +2,8 @@
> function onSuccess(data) {
>   debug("* got reply: " + data);
> 
>-  if (window.layoutTestController) {
>-    window.layoutTestController.notifyDone();
>+  if (window.testRunner) {
>+    window.testRunner.notifyDone();
>   }
> }
> 
>@@ -11,8 +11,8 @@ function onSuccess(data) {
> function onFailure(data) {
>   debug("* got failure: " + data);
> 
>-  if (window.layoutTestController) {
>-    window.layoutTestController.notifyDone();
>+  if (window.testRunner) {
>+    window.testRunner.notifyDone();
>   }
> }
> 
>@@ -21,8 +21,8 @@ function startIntentWithCallbacks() {
>   navigator.webkitStartActivity(new WebKitIntent("action1", "mime/type1", "test"), onSuccess, onFailure);
>   debug("* sent intent");
> 
>-  if (window.layoutTestController) {
>-    window.layoutTestController.waitUntilDone();
>+  if (window.testRunner) {
>+    window.testRunner.waitUntilDone();
>   } else {
>     alert('This test needs to run in DRT');
>   }

Flags:

abarth: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 93176: 156517