Some tests still refer to layoutTestController instead of testRunner
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 4 Aug 2012 06:26:36 +0000 (06:26 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 4 Aug 2012 06:26:36 +0000 (06:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=93176

Reviewed by Adam Barth.

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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@124691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

96 files changed:
LayoutTests/ChangeLog
LayoutTests/batterystatus/script-tests/event-after-navigation.js
LayoutTests/editing/deleting/smart-editing-disabled.html
LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js
LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js
LayoutTests/fast/dom/Geolocation/script-tests/disconnected-frame-permission-denied.js
LayoutTests/fast/dom/Geolocation/script-tests/error.js
LayoutTests/fast/dom/Geolocation/script-tests/maximum-age.js
LayoutTests/fast/dom/Geolocation/script-tests/multiple-requests.js
LayoutTests/fast/dom/Geolocation/script-tests/no-page-cache.js
LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-clear-watch.js
LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js
LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-success.js
LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-stops-watches.js
LayoutTests/fast/dom/Geolocation/script-tests/permission-denied.js
LayoutTests/fast/dom/Geolocation/script-tests/position-string.js
LayoutTests/fast/dom/Geolocation/script-tests/reentrant-error.js
LayoutTests/fast/dom/Geolocation/script-tests/reentrant-permission-denied.js
LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js
LayoutTests/fast/dom/Geolocation/script-tests/success.js
LayoutTests/fast/dom/Geolocation/script-tests/timeout.js
LayoutTests/fast/dom/Geolocation/script-tests/watch.js
LayoutTests/fast/dom/Geolocation/script-tests/window-close-crash.js
LayoutTests/fast/encoding/resources/char-encoding-utils.js
LayoutTests/fast/encoding/resources/dynamic-load-target.js
LayoutTests/fast/encoding/resources/invalid-xml.js
LayoutTests/fast/encoding/resources/parser-tests.js
LayoutTests/fast/events/touch/script-tests/touch-slider-no-js-touch-listener.js
LayoutTests/fast/events/touch/script-tests/touch-slider.js
LayoutTests/fast/harness/override-preferences-2-expected.txt
LayoutTests/fast/harness/override-preferences-2.html
LayoutTests/fast/harness/override-preferences-expected.txt
LayoutTests/fast/harness/override-preferences.html
LayoutTests/fast/harness/override-zzz-reset-expected.txt
LayoutTests/fast/harness/override-zzz-reset.html
LayoutTests/fast/harness/resources/results-test.js
LayoutTests/fast/harness/use-page-cache-expected.txt
LayoutTests/fast/harness/use-page-cache.html
LayoutTests/fast/ruby/after-block-doesnt-crash.html-disabled
LayoutTests/fast/ruby/after-table-doesnt-crash.html-disabled
LayoutTests/fast/ruby/generated-after-counter-doesnt-crash.html-disabled
LayoutTests/fast/ruby/generated-before-and-after-counter-doesnt-crash.html-disabled
LayoutTests/http/tests/eventsource/eventsource-events-after-close.html
LayoutTests/http/tests/misc/gmail-assert-on-load.html
LayoutTests/http/tests/misc/resources/char-encoding-in-hidden-charset-field.php
LayoutTests/http/tests/misc/resources/check-keygen-post.php
LayoutTests/http/tests/misc/resources/check-query-param.php
LayoutTests/http/tests/misc/resources/check-unnamed-file-included-in-formdata.php
LayoutTests/http/tests/misc/resources/chromium-selectionAsMarkup.html
LayoutTests/http/tests/misc/resources/delayed-log.php
LayoutTests/http/tests/misc/resources/form-post-textplain.php
LayoutTests/http/tests/misc/resources/location-test-xsl-style-sheet.xsl
LayoutTests/http/tests/misc/resources/percent-sign-in-form-data-field-name.cgi
LayoutTests/http/tests/misc/resources/post-echo-and-notify-done.cgi
LayoutTests/http/tests/misc/resources/prefetch-purpose.php
LayoutTests/http/tests/misc/resources/redirect-result.php
LayoutTests/http/tests/misc/resources/referrer-main-resource.php
LayoutTests/http/tests/misc/resources/referrer-result.php
LayoutTests/http/tests/misc/xhtml.php
LayoutTests/http/tests/misc/xmltokenizer-do-not-crash.pl
LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php
LayoutTests/http/tests/multipart/policy-ignore-crash.php
LayoutTests/http/tests/multipart/win-boundary-crash.html-disabled
LayoutTests/http/tests/navigation/post-goback-repost-policy.html-disabled
LayoutTests/http/tests/navigation/resources/back-send-referrer-helper.php
LayoutTests/http/tests/navigation/resources/check-ping.php
LayoutTests/http/tests/navigation/resources/document-location.js
LayoutTests/http/tests/navigation/resources/form-target.pl
LayoutTests/http/tests/navigation/resources/goback-with-policydelegate.php
LayoutTests/http/tests/navigation/resources/no-referrer-helper.php
LayoutTests/http/tests/navigation/resources/no-referrer-same-window-helper.php
LayoutTests/http/tests/navigation/resources/notify-done.html
LayoutTests/http/tests/navigation/resources/post-target-policy-test.php
LayoutTests/http/tests/navigation/resources/redirect-cycle-1.pl
LayoutTests/http/tests/navigation/resources/redirect302-metaredirect.pl
LayoutTests/http/tests/navigation/resources/redirected-post-request-contents.php
LayoutTests/http/tests/navigation/resources/submit-to-fragment.pl
LayoutTests/http/tests/navigation/resources/testcode.js
LayoutTests/http/tests/navigation/useragent.php
LayoutTests/http/tests/resources/js-test-post.js
LayoutTests/http/tests/resources/js-test-pre.js
LayoutTests/http/tests/security/contentSecurityPolicy/resources/securitypolicy-tests-base.js
LayoutTests/http/tests/ssl/resources/no-http-referer.cgi
LayoutTests/http/tests/ssl/verify-ssl-enabled.php
LayoutTests/networkinformation/script-tests/event-after-navigation.js
LayoutTests/platform/mac/fast/objc/script-tests/webScriptObject-hasWebScriptKey.js
LayoutTests/platform/qt/svg/repaint/filter-repaint-expected.txt
LayoutTests/transforms/3d/hit-testing/resources/hit-test-utils.js
LayoutTests/transforms/3d/point-mapping/point-mapping-helpers.js
LayoutTests/transitions/resources/transition-test-helpers.js
LayoutTests/transitions/transition-end-event-helpers.js
LayoutTests/webaudio/resources/audio-codec-test.js
LayoutTests/webaudio/resources/audio-testing.js
LayoutTests/webaudio/resources/audioparam-testing.js
LayoutTests/webaudio/resources/oscillator-testing.js
LayoutTests/webintents/resources/web-intents-testing.js

index 86c5722..1f98a9a 100644 (file)
@@ -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 Adam Barth.
+
+        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 media/media-fragments/TC0080-TC0089.html is slow
index 248299b..2338d2e 100644 (file)
@@ -3,7 +3,7 @@ description('Tests for a crash where an event is fired after the page has been n
 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 1cfc23d..ddeb81b 100644 (file)
@@ -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 543667a..1e32b1c 100644 (file)
@@ -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 4ba6c3b..0e14a54 100644 (file)
@@ -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 3380f46..c5e8ae5 100644 (file)
@@ -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 87383b9..2d13f3f 100644 (file)
@@ -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 99cde5d..6c8f860 100644 (file)
@@ -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 5dd64f3..662b6b5 100644 (file)
@@ -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 b442074..204bdea 100644 (file)
@@ -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 e0eb1c4..142543b 100644 (file)
@@ -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 d2651d4..b5e3d8f 100644 (file)
@@ -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 3bb0bbb..377310e 100644 (file)
@@ -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 8877a27..bfc9b81 100644 (file)
@@ -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 565ade8..e1cfe27 100644 (file)
@@ -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 7540ba7..852b40c 100644 (file)
@@ -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 1f08b72..5439e29 100644 (file)
@@ -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 4cc7ba1..ec71069 100644 (file)
@@ -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 643dabf..bf329bc 100644 (file)
@@ -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 582405e..f8d71be 100644 (file)
@@ -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 4def02c..944c5ce 100644 (file)
@@ -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 290f897..6f1fe0c 100644 (file)
@@ -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 7c84a3c..3b183eb 100644 (file)
@@ -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 2007c7f..874ed09 100644 (file)
@@ -20,8 +20,8 @@ function testsDone()
 
     isSuccessfullyParsed();
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function processResult(result)
index 6a0e175..2e66fe9 100644 (file)
@@ -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 aa63e29..0d1ca7c 100644 (file)
@@ -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 fb55af9..e4dfa4e 100644 (file)
@@ -12,9 +12,9 @@ document.write('<p>This test suite was converted from http://www.hixie.ch/tests/
   '<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 454fafb..d54a6d5 100644 (file)
@@ -23,7 +23,7 @@ var checkPosition = (function() {
 
 function onKeyDown() {
     checkPosition();
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
     isSuccessfullyParsed();
 }
 
@@ -31,8 +31,8 @@ document.addEventListener('keydown', onKeyDown);
 
 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 6391dd0..8df0872 100644 (file)
@@ -46,7 +46,7 @@ function onTouchEnd() {
 
 function onKeyDown() {
     isSuccessfullyParsed();
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 
 var sliderValue = 0;
@@ -105,8 +105,8 @@ document.addEventListener("keydown", onKeyDown, false);
 
 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 abcceaa..8a544f4 100644 (file)
@@ -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 bdb7164..8df4f83 100644 (file)
@@ -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 4c348e0..ff026d0 100644 (file)
@@ -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 523589a..db67ff3 100644 (file)
@@ -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 dee292e..6005024 100644 (file)
@@ -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 b5ae06e..3a80144 100644 (file)
@@ -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 6b60b30..18228ec 100644 (file)
@@ -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 2b4be97..dbb6fa1 100644 (file)
@@ -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 b9995e6..2564b60 100644 (file)
@@ -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 4184e17..b6ffd3b 100644 (file)
@@ -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 5edf7f1..515feec 100644 (file)
@@ -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 271c310..08936bb 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 <style type="text/css">
 
index 9ec77f7..2e604f3 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 <style type="text/css">
 
index 70524c2..6f9fd3f 100644 (file)
@@ -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 211264b..07d1e0d 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
 }
 </script>
 <body>
index 16fe6a5..47b85a2 100644 (file)
@@ -26,8 +26,8 @@ echo "<p>PASSED: $data </p>";
 ?>
 
 <script>
-if(window.layoutTestController)
-    layoutTestController.notifyDone();
+if(window.testRunner)
+    testRunner.notifyDone();
 </script>
 
 </body>
index be01ae7..e185a96 100644 (file)
@@ -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 a30604c..f8a2b9e 100644 (file)
@@ -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 09d5b28..c934489 100644 (file)
@@ -4,8 +4,8 @@ header("Content-Type: text/html; charset=UTF-8");
 <html>
 <head>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 </script>
 </head>
 <body>
index c889a28..1b833f8 100644 (file)
@@ -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 018eea2..2c68e2d 100644 (file)
@@ -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 63abca4..76e079a 100644 (file)
@@ -19,8 +19,8 @@ if($data == "f1=This is field #1 &!@$%\n='<>\r\nf2=This is field #2 \"\"") {
 }
 ?>
 <script>
-if(window.layoutTestController)
-    layoutTestController.notifyDone();
+if(window.testRunner)
+    testRunner.notifyDone();
 </script>
 </body>
 </html>
index 336cc66..e84e17b 100644 (file)
@@ -15,8 +15,8 @@
             else\r
                 document.getElementById("pass").innerHTML = "<span>PASS</span>";\r
 \r
-            if (window.layoutTestController)\r
-                layoutTestController.dumpAsText();\r
+            if (window.testRunner)\r
+                testRunner.dumpAsText();\r
         }\r
 \r
      </script>\r
index 717dad1..a08df19 100755 (executable)
@@ -19,8 +19,8 @@ print "if (pre.textContent.match('abc%40def'))\n";
 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 3d77182..6e07893 100755 (executable)
@@ -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 a31e8e5..ac60f9a 100644 (file)
@@ -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 40c31d5..d2d8520 100644 (file)
@@ -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 27902d0..b146d3d 100644 (file)
@@ -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 135bf10..8e1d876 100644 (file)
@@ -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 465893e..3b5b796 100644 (file)
@@ -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 0319422..4c8e3ac 100755 (executable)
@@ -14,7 +14,7 @@ print "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http:/
 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 3890cb8..bbb844e 100644 (file)
@@ -7,8 +7,8 @@ echo str_pad('', 5000);
 ?>
 
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 
 <?php
index 3ce5a59..09b5949 100644 (file)
@@ -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 78f4254..257be6c 100644 (file)
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 </head>
 <body>
index ba66fb6..5218a2f 100644 (file)
@@ -2,9 +2,9 @@
 <head>
 <script>
     
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
     
 function loaded()
index b54956a..cfc1f5c 100644 (file)
@@ -23,8 +23,8 @@ window.name: <script>document.write(window.name)</script>
     } else if (window.name == 2) {
         history.go(-1);
     } else {
-        if (window.layoutTestController)
-            window.layoutTestController.notifyDone();
+        if (window.testRunner)
+            window.testRunner.notifyDone();
     }
 </script>
 
index 8b1bb02..d1e669b 100644 (file)
@@ -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 a0ab4d8..a28b804 100644 (file)
@@ -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 200d032..c07187d 100755 (executable)
@@ -51,8 +51,8 @@ if (sessionStorage.topShouldNavAndGoBack) {
   }
 }
 
-if (isDone && window.layoutTestController)
-    layoutTestController.notifyDone();
+if (isDone && window.testRunner)
+    testRunner.notifyDone();
 
 </script>
 </body>
index fdd098c..ba09d3e 100644 (file)
@@ -4,8 +4,8 @@
 
 function loaded()
 {
-    if (window.layoutTestController)
-        layoutTestController.setCustomPolicyDelegate(true, true);
+    if (window.testRunner)
+        testRunner.setCustomPolicyDelegate(true, true);
 
     window.history.back();
 }
index cb6a749..fea93dc 100644 (file)
@@ -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 73a5fd8..8411d1c 100644 (file)
@@ -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>\r
-    var line = document.createElement('div');\r
-    line.appendChild(document.createTextNode(document.getElementById("referrer").innerText == "Referrer:" ? "PASS" : "FAIL"));\r
+<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 a320e5d..998e927 100644 (file)
@@ -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 49dafee..5beccd6 100644 (file)
@@ -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 926bb8d..34bf4b3 100755 (executable)
@@ -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 cd8c11b..38f39ea 100755 (executable)
@@ -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 93b2da3..eef89c3 100644 (file)
@@ -34,5 +34,5 @@ if (sizeof($_POST) > 0 || sizeof($_FILES) > 0) {
     echo "no POST data is present.<br>";
 }
 
-echo "<script>if (window.layoutTestController) layoutTestController.notifyDone();</script>"
+echo "<script>if (window.testRunner) testRunner.notifyDone();</script>"
 ?>
index 97ee97b..b2f04bd 100755 (executable)
@@ -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 99b5302..389187f 100644 (file)
@@ -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, extraStep) {
 // 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(testCase) {
 // 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 c200a15..a548924 100644 (file)
@@ -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 11a9e5f..7bf7404 100644 (file)
@@ -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 0aa417d..86f6ddb 100644 (file)
@@ -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 d6db12a..8ec9ea1 100644 (file)
@@ -1,5 +1,5 @@
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(msg) {
     var txt = document.createTextNode(msg);
index 273d03c..9cf4596 100755 (executable)
@@ -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 de1158b..3e8f684 100644 (file)
@@ -1,6 +1,6 @@
 <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 </script>
 
 HTTPS is <?= $_SERVER['HTTPS'] ?>!
index 0a60863..b233179 100644 (file)
@@ -3,7 +3,7 @@ description('Tests for a crash where an event is fired after the page has been n
 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 9fbbdb1..637d320 100644 (file)
@@ -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 5195abc..9bcd42c 100644 (file)
@@ -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 a24a33a..9012e2e 100644 (file)
@@ -1,5 +1,5 @@
-if (window.layoutTestController)
-  layoutTestController.dumpAsText();
+if (window.testRunner)
+  testRunner.dumpAsText();
 
 function log(s)
 {
index d7a2af2..c26a030 100644 (file)
@@ -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 fd83147..3d40b4f 100644 (file)
@@ -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 ab6af9d..d77735b 100644 (file)
@@ -49,9 +49,9 @@ function runTransitionTest(expected, callback)
 {
   _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, callback)
     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 b6520e8..e1305b6 100644 (file)
@@ -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, optionalSampleRate)
     );
     
     bufferLoader.load();
-    layoutTestController.waitUntilDone();
+    testRunner.waitUntilDone();
 }
 
 function finishedLoading(bufferList)
 {
-    layoutTestController.setAudioData(createAudioData(bufferList[0]));
-    layoutTestController.notifyDone();
+    testRunner.setAudioData(createAudioData(bufferList[0]));
+    testRunner.notifyDone();
 }
 
index f212e69..537130b 100644 (file)
@@ -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 8d3ac02..a176300 100644 (file)
@@ -397,9 +397,9 @@ function doAutomation(numberOfTests, initialValue, setValueFunction, automationF
 //
 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 8ac3187..d5a2ead 100644 (file)
@@ -56,5 +56,5 @@ function generateExponentialOscillatorSweep(oscillatorType) {
     context.oncomplete = finishAudioTest;
     context.startRendering();    
 
-    layoutTestController.waitUntilDone();
+    testRunner.waitUntilDone();
 }
index a765ada..8b4ea60 100644 (file)
@@ -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');
   }