HTTP tests should use testRunner instead of layoutTestController

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

Reviewed by Darin Adler.

* http/tests/appcache/:
* http/tests/cache/cancel-during-failure-crash.html:
* http/tests/cache/cancel-during-revalidation-succeeded.html:
* http/tests/cache/history-only-cached-subresource-loads-max-age-https.html:
* http/tests/cache/history-only-cached-subresource-loads.html:
* http/tests/cache/loaded-from-cache-after-reload-within-iframe.html:
* http/tests/cache/loaded-from-cache-after-reload.html:
* http/tests/cache/post-redirect-get.php:
* http/tests/cache/post-with-cached-subresources.php:
* http/tests/cache/resources/stopped-revalidation-result.html:
* http/tests/cache/resources/subresource-test.js:
(nextTest):
* http/tests/cache/stopped-revalidation.html:
* http/tests/cache/subresource-failover-to-network.html:
* http/tests/cache/subresource-fragment-identifier.html:
* http/tests/cache/subresource-multiple-instances.html:
* http/tests/cache/xhr-body.html:
* http/tests/cache/zero-length-xhr.html:
* http/tests/canvas/philip/tests.js:
(_addTest.endTest):
(_addTest.window.onload):
(_addTest):
* http/tests/canvas/webgl/origin-clean-conformance.html:
* http/tests/cookies/resources/cookies-test-pre.js:
* http/tests/cookies/resources/resetCookies.js:
(resetCookies):
* http/tests/cookies/resources/setArraycookies-result.php:
* http/tests/cookies/resources/setUtf8Cookies-result.php:
* http/tests/cookies/resources/third-party-cookie-relaxing-iframe.html:
* http/tests/cookies/third-party-cookie-relaxing.html:
* http/tests/css/cross-fade-reload.html:
* http/tests/css/css-imports-redirect-cycle.html:
* http/tests/css/font-face-src-loading.html:
* http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet-in-error.js:
* http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet.js:
* http/tests/css/resources/request-logging.js:
(startTest):
(endTest):
* http/tests/download/basic-ascii.html:
* http/tests/download/default-encoding.html:
* http/tests/download/inherited-encoding-form-submission-result.html:
* http/tests/download/inherited-encoding.html:
* http/tests/download/literal-utf-8.html:
* http/tests/eventsource/eventsource-bad-mime-type.html:
* http/tests/eventsource/eventsource-content-type-charset.html:
* http/tests/eventsource/eventsource-eof.html:
* http/tests/eventsource/eventsource-parse-event-stream.html:
* http/tests/eventsource/eventsource-reconnect-during-navigate-crash.html:
* http/tests/eventsource/eventsource-reconnect.html:
* http/tests/eventsource/eventsource-status-code-states.html:
* http/tests/eventsource/existent-eventsource-status-error-iframe-crash.html:
* http/tests/eventsource/non-existent-eventsource-status-error-iframe-crash.html:
* http/tests/eventsource/resources/wait-then-notify-done.php:
* http/tests/eventsource/workers/eventsource-simple.html:
* http/tests/fileapi/create-blob-url-from-data-url.html:
* http/tests/filesystem/no-cache-filesystem-url.html:
* http/tests/globalhistory/history-delegate-basic-302-redirect.html:
* http/tests/globalhistory/history-delegate-basic-refresh-redirect.html:
* http/tests/globalhistory/history-delegate-basic-title.html:
* http/tests/globalhistory/history-delegate-basic-visited-links.html:
* http/tests/history/:
* http/tests/incremental/frame-focus-before-load.html:
* http/tests/incremental/partial-jpeg.html:
* http/tests/incremental/pause-in-script-element.pl:
* http/tests/incremental/slow-utf8-css.html:
* http/tests/incremental/slow-utf8-html.pl:
* http/tests/incremental/split-hex-entities.pl:
* http/tests/inspector-enabled/console-clear-arguments-on-frame-navigation.html:
* http/tests/inspector-enabled/console-clear-arguments-on-frame-remove.html:
* http/tests/inspector-enabled/console-log-before-frame-navigation.html:
* http/tests/inspector-enabled/contentSecurityPolicy-blocks-setInterval.html:
* http/tests/inspector-enabled/contentSecurityPolicy-blocks-setTimeout.html:
* http/tests/inspector-enabled/database-open.html:
* http/tests/inspector-enabled/dedicated-workers-list.html:
* http/tests/inspector-enabled/document-write.html:
* http/tests/inspector-enabled/dom-storage-open.html:
* http/tests/inspector-enabled/injected-script-discard.html:
* http/tests/inspector-enabled/resources/console-clear-arguments-iframe.html:
* http/tests/inspector/console-resource-errors.html:
* http/tests/inspector/console-websocket-error.html:
* http/tests/inspector/indexeddb/resources/without-indexed-db.html:
* http/tests/inspector/inspector-test.js:
* http/tests/inspector/network/ping.html:
* http/tests/inspector/resource-tree/resources/script-initial.js:
(foo):
* http/tests/inspector/resource-tree/resources/script-navigated.js:
(foo):
* http/tests/inspector/web-socket-frame-error.html:
* http/tests/inspector/web-socket-frame.html:
* http/tests/loading/:
* http/tests/local/absolute-url-strip-whitespace.html:
* http/tests/local/blob/script-tests/send-hybrid-blob.js:
(runTests):
* http/tests/local/drag-over-remote-content.html:
* http/tests/local/fail.css:
(#pass):
* http/tests/local/formdata/send-form-data-constructed-from-form.html:
* http/tests/local/link-stylesheet-load-order-preload.html:
* http/tests/local/link-stylesheet-load-order.html:
* http/tests/local/link-stylesheet-preferred.html:
* http/tests/local/style-access-before-stylesheet-loaded.html:
* http/tests/local/stylesheet-and-script-load-order-http.html:
* http/tests/local/stylesheet-and-script-load-order-media-print.html:
* http/tests/local/stylesheet-and-script-load-order.html:
* http/tests/media/reload-after-dialog.html:
* http/tests/media/resources/test.txt:
* http/tests/media/video-buffered-range-contains-currentTime.html:
* http/tests/media/video-cancel-load.html:
* http/tests/media/video-cookie.html:
* http/tests/media/video-error-abort.html:
* http/tests/messaging/cross-domain-message-event-dispatch.html:
* http/tests/messaging/cross-domain-message-send.html:
* http/tests/mime/quoted-charset.php:
* http/tests/mime/resources/uppercase-mime-type.php:
* http/tests/mime/standard-mode-does-not-load-stylesheet-with-text-plain-and-css-extension.html:
* http/tests/mime/standard-mode-does-not-load-stylesheet-with-text-plain.html:
* http/tests/mime/standard-mode-loads-stylesheet-with-charset-and-css-extension.html:
* http/tests/mime/standard-mode-loads-stylesheet-with-charset.html:
* http/tests/mime/standard-mode-loads-stylesheet-with-empty-content-type.html:
* http/tests/mime/standard-mode-loads-stylesheet-with-text-css-and-invalid-type.html:
* http/tests/mime/uppercase-mime-type.html:
* http/tests/misc/:
* http/tests/websocket/tests/:
* http/tests/workers/resources/worker-redirect.js:
(runNextTest):
* http/tests/workers/resources/worker-util.js:
(waitUntilThreadCountMatches.return):
(waitUntilThreadCountMatches):
(done):
* http/tests/workers/shared-worker-importScripts.html:
* http/tests/workers/shared-worker-invalid-url.html:
* http/tests/workers/terminate-during-sync-operation.html:
* http/tests/workers/text-encoding.html:
* http/tests/workers/worker-document-domain-security.html:
* http/tests/workers/worker-importScripts.html:
* http/tests/workers/worker-importScriptsOnError.html:
* http/tests/workers/worker-invalid-url.html:
* http/tests/workers/worker-workerScriptNotThere.html:
* http/tests/xmlhttprequest/:
* http/tests/xmlviewer/dumpAsText/frames.html:
* http/tests/xmlviewer/dumpAsText/xhtml-tag.xml:
* http/tests/xmlviewer/extensions-api.html:
* platform/chromium-win/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt:
* platform/chromium/http/tests/misc/execute-and-return-value.html:
* platform/chromium/http/tests/misc/selectionAsMarkup.html:
* platform/chromium/http/tests/permissionclient/image-permissions.html:
* platform/chromium/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt:
* platform/chromium/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt:
* platform/chromium/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-window-open-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-2-level-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-to-data-url-sub-frame-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-to-data-url-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-from-javascript-url-window-open-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-from-data-url-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-location-change-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-window-open-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-2-level-expected.txt:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-window-open-expected.txt:
* platform/chromium/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed.html:
* platform/chromium/http/tests/security/mixedContent/insecure-iframe-in-main-frame-blocked.html:
* platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html:
* platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-blocked.html:
* platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-allowed.html:
* platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-blocked.html:
* platform/chromium/http/tests/security/window-named-proto-expected.txt:
* platform/qt/http/tests/cookies/strict-third-party-cookie-blocking.html:
* platform/qt/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt:
* platform/qt/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt:
* platform/qt/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fe0c73d6a86d75e945e98ec42b1d245404eb5b66..fb5f9afe85914d323f1fbaf399a39644ef2b8fe4 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,184 @@
+2012-06-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        HTTP tests should use testRunner instead of layoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=88969
+
+        Reviewed by Darin Adler.
+
+        * http/tests/appcache/:
+        * http/tests/cache/cancel-during-failure-crash.html:
+        * http/tests/cache/cancel-during-revalidation-succeeded.html:
+        * http/tests/cache/history-only-cached-subresource-loads-max-age-https.html:
+        * http/tests/cache/history-only-cached-subresource-loads.html:
+        * http/tests/cache/loaded-from-cache-after-reload-within-iframe.html:
+        * http/tests/cache/loaded-from-cache-after-reload.html:
+        * http/tests/cache/post-redirect-get.php:
+        * http/tests/cache/post-with-cached-subresources.php:
+        * http/tests/cache/resources/stopped-revalidation-result.html:
+        * http/tests/cache/resources/subresource-test.js:
+        (nextTest):
+        * http/tests/cache/stopped-revalidation.html:
+        * http/tests/cache/subresource-failover-to-network.html:
+        * http/tests/cache/subresource-fragment-identifier.html:
+        * http/tests/cache/subresource-multiple-instances.html:
+        * http/tests/cache/xhr-body.html:
+        * http/tests/cache/zero-length-xhr.html:
+        * http/tests/canvas/philip/tests.js:
+        (_addTest.endTest):
+        (_addTest.window.onload):
+        (_addTest):
+        * http/tests/canvas/webgl/origin-clean-conformance.html:
+        * http/tests/cookies/resources/cookies-test-pre.js:
+        * http/tests/cookies/resources/resetCookies.js:
+        (resetCookies):
+        * http/tests/cookies/resources/setArraycookies-result.php:
+        * http/tests/cookies/resources/setUtf8Cookies-result.php:
+        * http/tests/cookies/resources/third-party-cookie-relaxing-iframe.html:
+        * http/tests/cookies/third-party-cookie-relaxing.html:
+        * http/tests/css/cross-fade-reload.html:
+        * http/tests/css/css-imports-redirect-cycle.html:
+        * http/tests/css/font-face-src-loading.html:
+        * http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet-in-error.js:
+        * http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet.js:
+        * http/tests/css/resources/request-logging.js:
+        (startTest):
+        (endTest):
+        * http/tests/download/basic-ascii.html:
+        * http/tests/download/default-encoding.html:
+        * http/tests/download/inherited-encoding-form-submission-result.html:
+        * http/tests/download/inherited-encoding.html:
+        * http/tests/download/literal-utf-8.html:
+        * http/tests/eventsource/eventsource-bad-mime-type.html:
+        * http/tests/eventsource/eventsource-content-type-charset.html:
+        * http/tests/eventsource/eventsource-eof.html:
+        * http/tests/eventsource/eventsource-parse-event-stream.html:
+        * http/tests/eventsource/eventsource-reconnect-during-navigate-crash.html:
+        * http/tests/eventsource/eventsource-reconnect.html:
+        * http/tests/eventsource/eventsource-status-code-states.html:
+        * http/tests/eventsource/existent-eventsource-status-error-iframe-crash.html:
+        * http/tests/eventsource/non-existent-eventsource-status-error-iframe-crash.html:
+        * http/tests/eventsource/resources/wait-then-notify-done.php:
+        * http/tests/eventsource/workers/eventsource-simple.html:
+        * http/tests/fileapi/create-blob-url-from-data-url.html:
+        * http/tests/filesystem/no-cache-filesystem-url.html:
+        * http/tests/globalhistory/history-delegate-basic-302-redirect.html:
+        * http/tests/globalhistory/history-delegate-basic-refresh-redirect.html:
+        * http/tests/globalhistory/history-delegate-basic-title.html:
+        * http/tests/globalhistory/history-delegate-basic-visited-links.html:
+        * http/tests/history/:
+        * http/tests/incremental/frame-focus-before-load.html:
+        * http/tests/incremental/partial-jpeg.html:
+        * http/tests/incremental/pause-in-script-element.pl:
+        * http/tests/incremental/slow-utf8-css.html:
+        * http/tests/incremental/slow-utf8-html.pl:
+        * http/tests/incremental/split-hex-entities.pl:
+        * http/tests/inspector-enabled/console-clear-arguments-on-frame-navigation.html:
+        * http/tests/inspector-enabled/console-clear-arguments-on-frame-remove.html:
+        * http/tests/inspector-enabled/console-log-before-frame-navigation.html:
+        * http/tests/inspector-enabled/contentSecurityPolicy-blocks-setInterval.html:
+        * http/tests/inspector-enabled/contentSecurityPolicy-blocks-setTimeout.html:
+        * http/tests/inspector-enabled/database-open.html:
+        * http/tests/inspector-enabled/dedicated-workers-list.html:
+        * http/tests/inspector-enabled/document-write.html:
+        * http/tests/inspector-enabled/dom-storage-open.html:
+        * http/tests/inspector-enabled/injected-script-discard.html:
+        * http/tests/inspector-enabled/resources/console-clear-arguments-iframe.html:
+        * http/tests/inspector/console-resource-errors.html:
+        * http/tests/inspector/console-websocket-error.html:
+        * http/tests/inspector/indexeddb/resources/without-indexed-db.html:
+        * http/tests/inspector/inspector-test.js:
+        * http/tests/inspector/network/ping.html:
+        * http/tests/inspector/resource-tree/resources/script-initial.js:
+        (foo):
+        * http/tests/inspector/resource-tree/resources/script-navigated.js:
+        (foo):
+        * http/tests/inspector/web-socket-frame-error.html:
+        * http/tests/inspector/web-socket-frame.html:
+        * http/tests/loading/:
+        * http/tests/local/absolute-url-strip-whitespace.html:
+        * http/tests/local/blob/script-tests/send-hybrid-blob.js:
+        (runTests):
+        * http/tests/local/drag-over-remote-content.html:
+        * http/tests/local/fail.css:
+        (#pass):
+        * http/tests/local/formdata/send-form-data-constructed-from-form.html:
+        * http/tests/local/link-stylesheet-load-order-preload.html:
+        * http/tests/local/link-stylesheet-load-order.html:
+        * http/tests/local/link-stylesheet-preferred.html:
+        * http/tests/local/style-access-before-stylesheet-loaded.html:
+        * http/tests/local/stylesheet-and-script-load-order-http.html:
+        * http/tests/local/stylesheet-and-script-load-order-media-print.html:
+        * http/tests/local/stylesheet-and-script-load-order.html:
+        * http/tests/media/reload-after-dialog.html:
+        * http/tests/media/resources/test.txt:
+        * http/tests/media/video-buffered-range-contains-currentTime.html:
+        * http/tests/media/video-cancel-load.html:
+        * http/tests/media/video-cookie.html:
+        * http/tests/media/video-error-abort.html:
+        * http/tests/messaging/cross-domain-message-event-dispatch.html:
+        * http/tests/messaging/cross-domain-message-send.html:
+        * http/tests/mime/quoted-charset.php:
+        * http/tests/mime/resources/uppercase-mime-type.php:
+        * http/tests/mime/standard-mode-does-not-load-stylesheet-with-text-plain-and-css-extension.html:
+        * http/tests/mime/standard-mode-does-not-load-stylesheet-with-text-plain.html:
+        * http/tests/mime/standard-mode-loads-stylesheet-with-charset-and-css-extension.html:
+        * http/tests/mime/standard-mode-loads-stylesheet-with-charset.html:
+        * http/tests/mime/standard-mode-loads-stylesheet-with-empty-content-type.html:
+        * http/tests/mime/standard-mode-loads-stylesheet-with-text-css-and-invalid-type.html:
+        * http/tests/mime/uppercase-mime-type.html:
+        * http/tests/misc/:
+        * http/tests/websocket/tests/:
+        * http/tests/workers/resources/worker-redirect.js:
+        (runNextTest):
+        * http/tests/workers/resources/worker-util.js:
+        (waitUntilThreadCountMatches.return):
+        (waitUntilThreadCountMatches):
+        (done):
+        * http/tests/workers/shared-worker-importScripts.html:
+        * http/tests/workers/shared-worker-invalid-url.html:
+        * http/tests/workers/terminate-during-sync-operation.html:
+        * http/tests/workers/text-encoding.html:
+        * http/tests/workers/worker-document-domain-security.html:
+        * http/tests/workers/worker-importScripts.html:
+        * http/tests/workers/worker-importScriptsOnError.html:
+        * http/tests/workers/worker-invalid-url.html:
+        * http/tests/workers/worker-workerScriptNotThere.html:
+        * http/tests/xmlhttprequest/:
+        * http/tests/xmlviewer/dumpAsText/frames.html:
+        * http/tests/xmlviewer/dumpAsText/xhtml-tag.xml:
+        * http/tests/xmlviewer/extensions-api.html:
+        * platform/chromium-win/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt:
+        * platform/chromium/http/tests/misc/execute-and-return-value.html:
+        * platform/chromium/http/tests/misc/selectionAsMarkup.html:
+        * platform/chromium/http/tests/permissionclient/image-permissions.html:
+        * platform/chromium/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt:
+        * platform/chromium/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt:
+        * platform/chromium/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-window-open-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-2-level-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-to-data-url-sub-frame-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-to-data-url-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-from-javascript-url-window-open-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-from-data-url-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-location-change-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-window-open-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-2-level-expected.txt:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-to-data-url-window-open-expected.txt:
+        * platform/chromium/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed.html:
+        * platform/chromium/http/tests/security/mixedContent/insecure-iframe-in-main-frame-blocked.html:
+        * platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html:
+        * platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-blocked.html:
+        * platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-allowed.html:
+        * platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-blocked.html:
+        * platform/chromium/http/tests/security/window-named-proto-expected.txt:
+        * platform/qt/http/tests/cookies/strict-third-party-cookie-blocking.html:
+        * platform/qt/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt:
+        * platform/qt/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt:
+        * platform/qt/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt:
+
 2012-06-11  Kinuko Yasuda  <kinuko@chromium.org>
 
         Unprefix Blob.webkitSlice

diff --git a/LayoutTests/http/tests/appcache/404-manifest.html b/LayoutTests/http/tests/appcache/404-manifest.html
index 9b9bd305d03307d40c70e7d356661ecf2cf7f055..050148a2c7996129e0ba62928b43ef64f3ed0a28 100644 (file)
--- a/LayoutTests/http/tests/appcache/404-manifest.html
+++ b/LayoutTests/http/tests/appcache/404-manifest.html
@@ -1,8 +1,8 @@
 <html manifest="does-not-exist.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -43,8 +43,8 @@ function test()
         log("FAILURE: Could not load data.");
     }
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 var gotCheckingEvent = false;

diff --git a/LayoutTests/http/tests/appcache/404-resource.html b/LayoutTests/http/tests/appcache/404-resource.html
index 5439b8f1f88eea7a3d3db8eb584b21094e6c837e..1b24e5dfd996f59b6009fb723c79d4150f96c705 100644 (file)
--- a/LayoutTests/http/tests/appcache/404-resource.html
+++ b/LayoutTests/http/tests/appcache/404-resource.html
@@ -4,9 +4,9 @@
 <p>Should say SUCCESS:</p>
 <div id=result></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -26,8 +26,8 @@ function test()
     else
         log("FAILURE: cache status is not uncached: " + applicationCache.status);
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', function() { unexpectedCallback("cached"); cacheCallback() }, false);

diff --git a/LayoutTests/http/tests/appcache/abort-cache-onchecking-manifest-404.html b/LayoutTests/http/tests/appcache/abort-cache-onchecking-manifest-404.html
index 230fb28998c3d993706a59683daff1a6be9fcb80..00854f8d00c76f92afdc7b0bcbb2cc0d8fecad08 100755 (executable)
--- a/LayoutTests/http/tests/appcache/abort-cache-onchecking-manifest-404.html
+++ b/LayoutTests/http/tests/appcache/abort-cache-onchecking-manifest-404.html
@@ -1,8 +1,8 @@
 <html manifest="resources/abort-cache-onchecking-manifest-404.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message) {
@@ -16,28 +16,28 @@ function onchecking() {
 function onnoupdate() {
     log("FAILURE");
     log("noupdate");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function oncached() {
     log("FAILURE");
     log("CACHED");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onupdateready() {
     log("FAILURE");
     log("UPDATEREADY");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onerror() {
     log("SUCCESS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('checking', onchecking, false);

diff --git a/LayoutTests/http/tests/appcache/abort-cache-onchecking-resource-404.html b/LayoutTests/http/tests/appcache/abort-cache-onchecking-resource-404.html
index c710b40e25c062278ae54c0396fcec46cb889d5e..75710e9f6c202c83a0be2807881bd074d07550e9 100755 (executable)
--- a/LayoutTests/http/tests/appcache/abort-cache-onchecking-resource-404.html
+++ b/LayoutTests/http/tests/appcache/abort-cache-onchecking-resource-404.html
@@ -1,8 +1,8 @@
 <html manifest="resources/abort-cache-onchecking-resource-404.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message) {
@@ -16,28 +16,28 @@ function onchecking() {
 function onnoupdate() {
     log("FAILURE");
     log("noupdate");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function oncached() {
     log("FAILURE");
     log("CACHED");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onupdateready() {
     log("FAILURE");
     log("UPDATEREADY");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onerror() {
     log("SUCCESS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('checking', onchecking, false);

diff --git a/LayoutTests/http/tests/appcache/abort-cache-onchecking.html b/LayoutTests/http/tests/appcache/abort-cache-onchecking.html
index 754669565cda5d0bad9a02a2d9297fe189ae9f81..76e4b786f57e734c095437c7121734f539222f14 100644 (file)
--- a/LayoutTests/http/tests/appcache/abort-cache-onchecking.html
+++ b/LayoutTests/http/tests/appcache/abort-cache-onchecking.html
@@ -1,8 +1,8 @@
 <html manifest="resources/abort-cache-onchecking.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message) {
@@ -16,28 +16,28 @@ function onchecking() {
 function onnoupdate() {
     log("FAILURE");
     log("noupdate");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function oncached() {
     log("FAILURE");
     log("CACHED");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onupdateready() {
     log("FAILURE");
     log("UPDATEREADY");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onerror() {
     log("SUCCESS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('checking', onchecking, false);

diff --git a/LayoutTests/http/tests/appcache/abort-cache-ondownloading-manifest-404.html b/LayoutTests/http/tests/appcache/abort-cache-ondownloading-manifest-404.html
index ba48dfe0e9a266979b0a9aaf52528285c98f5f63..67738abdca9ea962454b0ec80346bec4878c9263 100755 (executable)
--- a/LayoutTests/http/tests/appcache/abort-cache-ondownloading-manifest-404.html
+++ b/LayoutTests/http/tests/appcache/abort-cache-ondownloading-manifest-404.html
@@ -1,8 +1,8 @@
 <html manifest="resources/abort-cache-ondownloading-manifest-404.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message) {
@@ -16,28 +16,28 @@ function ondownloading() {
 function onnoupdate() {
     log("FAILURE");
     log("noupdate");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function oncached() {
     log("FAILURE");
     log("CACHED");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onupdateready() {
     log("FAILURE");
     log("UPDATEREADY");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onerror() {
     log("SUCCESS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('downloading', ondownloading, false);

diff --git a/LayoutTests/http/tests/appcache/abort-cache-ondownloading-resource-404.html b/LayoutTests/http/tests/appcache/abort-cache-ondownloading-resource-404.html
index da08cce8cde8ffce8779f15591fb8569b6639044..b36efd288466b5c1de314d434e4b56f0fd67ede9 100755 (executable)
--- a/LayoutTests/http/tests/appcache/abort-cache-ondownloading-resource-404.html
+++ b/LayoutTests/http/tests/appcache/abort-cache-ondownloading-resource-404.html
@@ -1,8 +1,8 @@
 <html manifest="resources/abort-cache-ondownloading-resource-404.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message) {
@@ -16,28 +16,28 @@ function ondownloading() {
 function onnoupdate() {
     log("FAILURE");
     log("noupdate");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function oncached() {
     log("FAILURE");
     log("CACHED");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onupdateready() {
     log("FAILURE");
     log("UPDATEREADY");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onerror() {
     log("SUCCESS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('downloading', ondownloading, false);

diff --git a/LayoutTests/http/tests/appcache/abort-cache-ondownloading.html b/LayoutTests/http/tests/appcache/abort-cache-ondownloading.html
index 7d6d31abdbc42db38503544311cbb6598be986c0..1903fa22c01cf5c26e02e6f5ede138547a088f35 100755 (executable)
--- a/LayoutTests/http/tests/appcache/abort-cache-ondownloading.html
+++ b/LayoutTests/http/tests/appcache/abort-cache-ondownloading.html
@@ -1,8 +1,8 @@
 <html manifest="resources/abort-cache-ondownloading.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message) {
@@ -16,28 +16,28 @@ function ondownloading() {
 function onnoupdate() {
     log("FAILURE");
     log("noupdate");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function oncached() {
     log("FAILURE");
     log("CACHED");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onupdateready() {
     log("FAILURE");
     log("UPDATEREADY");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onerror() {
     log("SUCCESS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('downloading', ondownloading, false);

diff --git a/LayoutTests/http/tests/appcache/abort-cache-onprogress.html b/LayoutTests/http/tests/appcache/abort-cache-onprogress.html
index ae14ef4b4b45705b4b88952ac5dfd982cee10509..80202d1e7404e3d16b2a73ec38a573c095fc8b41 100644 (file)
--- a/LayoutTests/http/tests/appcache/abort-cache-onprogress.html
+++ b/LayoutTests/http/tests/appcache/abort-cache-onprogress.html
@@ -1,8 +1,8 @@
 <html manifest="resources/abort-cache-onprogress.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message) {
@@ -18,28 +18,28 @@ function onprogress(event) {
 function onnoupdate() {
     log("FAILURE");
     log("noupdate");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function oncached() {
     log("FAILURE");
     log("CACHED");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onupdateready() {
     log("FAILURE");
     log("UPDATEREADY");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onerror() {
     log("SUCCESS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('noupdate', onnoupdate, false);

diff --git a/LayoutTests/http/tests/appcache/auth.html b/LayoutTests/http/tests/appcache/auth.html
index 27b0ba6fffac0edec9cbd0d31e83a4a6bd83c502..e2576266cc2824f0e5ccea1ece84de628ec8495f 100644 (file)
--- a/LayoutTests/http/tests/appcache/auth.html
+++ b/LayoutTests/http/tests/appcache/auth.html
@@ -1,9 +1,9 @@
 <body>
 <p>Test that appcache works with authentication. Should say SUCCESS:</p>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 // Store authentication credentials.
@@ -21,8 +21,8 @@ function success()
     text.appendChild(document.createTextNode("SUCCESS"));
     document.body.replaceChild(text, document.getElementsByTagName("iframe")[0]);
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 </script>
 </body>

diff --git a/LayoutTests/http/tests/appcache/crash-when-navigating-away-then-back.html b/LayoutTests/http/tests/appcache/crash-when-navigating-away-then-back.html
index 5b1fd9b878b8d2eb230588ddd57675f55c1de351..7581a16ded9d73b5c522b26bfc222cdc8bf925ac 100644 (file)
--- a/LayoutTests/http/tests/appcache/crash-when-navigating-away-then-back.html
+++ b/LayoutTests/http/tests/appcache/crash-when-navigating-away-then-back.html
@@ -5,22 +5,22 @@ function openWindow()
     window.open('resources/crash-when-navigating-away-then-back.html')   
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
-    layoutTestController.setCanOpenWindows();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
+    testRunner.setCanOpenWindows();
 } else {
     document.write('<div id="manual-instructions">Click <a href="javascript:openWindow()">this link</a> twice. A window should open and close twice without crashing.</div>')
 }
 
 function closedWindow()
 {
-    if (window.layoutTestController)
+    if (window.testRunner)
         setTimeout(openWindow, 100);
 }
 
 </script>
-<body onload="if (window.layoutTestController) openWindow()">
+<body onload="if (window.testRunner) openWindow()">
 <div>This tests that loading a page with a manifest, navigating away from the page, and then back does not cause a crash.</div>
 <div id="result">FAILURE - test not completed</div>
 </html>

diff --git a/LayoutTests/http/tests/appcache/credential-url.html b/LayoutTests/http/tests/appcache/credential-url.html
index b6c7eecfd986272590378568043ddd5b1cd0d206..d0a1cc77999837790997d85316c8a78ea6f4e4ed 100644 (file)
--- a/LayoutTests/http/tests/appcache/credential-url.html
+++ b/LayoutTests/http/tests/appcache/credential-url.html
@@ -2,9 +2,9 @@
 <body>
 <p>Test that application cache doesn't block loading resources from the same origin with credential.</p>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function test()
@@ -17,8 +17,8 @@ function test()
 function success()
 {
     document.body.replaceChild(document.createTextNode("SUCCESS"), document.getElementsByTagName("iframe")[0]);
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.oncached = test;

diff --git a/LayoutTests/http/tests/appcache/cyrillic-uri.html b/LayoutTests/http/tests/appcache/cyrillic-uri.html
index c86a26144bd4504b7f486bd0dfea27305be095b6..1bd60cb89c23bcf481aab2c0d211284098bb2ed7 100644 (file)
--- a/LayoutTests/http/tests/appcache/cyrillic-uri.html
+++ b/LayoutTests/http/tests/appcache/cyrillic-uri.html
@@ -8,9 +8,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -67,8 +67,8 @@ function test()
 function frameDone(evt)
 {
     log("DONE");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.onnoupdate = function() { test() }

diff --git a/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer.html b/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer.html
index 776a1d2f7a43cf84f9171fcce94a070b74c92215..0bdc710777f2be4c0efabec46883265e4324a6fb 100644 (file)
--- a/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer.html
+++ b/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer.html
@@ -1,14 +1,14 @@
 <html>
 <script>
-if (window.layoutTestController) {
-  layoutTestController.dumpAsText();
-  layoutTestController.waitUntilDone();
+if (window.testRunner) {
+  testRunner.dumpAsText();
+  testRunner.waitUntilDone();
 }
 
 window.onmessage = function() {
   document.getElementById('result').innerHTML = "SUCCESS";
-  if (window.layoutTestController)
-    layoutTestController.notifyDone();
+  if (window.testRunner)
+    testRunner.notifyDone();
 }
 
 function killChildFrame() {

diff --git a/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising.html b/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising.html
index 902d3a83eb2e95ebf2a399ddd2cae97ede097054..c61f427143c8e406d45175b4782ef10a9eb29f18 100644 (file)
--- a/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising.html
+++ b/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising.html
@@ -5,15 +5,15 @@
     var isParentFrame = window == window.top;
 
     if (isParentFrame) {
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText()
-            layoutTestController.waitUntilDone();
+        if (window.testRunner) {
+            testRunner.dumpAsText()
+            testRunner.waitUntilDone();
         }
 
         window.onmessage = function() {
             document.getElementById('result').innerHTML = "SUCCESS";
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
+            if (window.testRunner)
+                testRunner.notifyDone();
         }
     } else {
         window.applicationCache.onchecking = function() {

diff --git a/LayoutTests/http/tests/appcache/deferred-events.html b/LayoutTests/http/tests/appcache/deferred-events.html
index ba9cf83ab9b6a71ffeec9a9d5889d7af205c672d..1a822fc78fc320e110c276885d537446f13e30b2 100644 (file)
--- a/LayoutTests/http/tests/appcache/deferred-events.html
+++ b/LayoutTests/http/tests/appcache/deferred-events.html
@@ -3,16 +3,16 @@
   <script type="text/javascript">
     var onloadHasBeenCalled = false;
 
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText()
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText()
+        testRunner.waitUntilDone();
     }
 
     window.applicationCache.onchecking = function() {
         if (onloadHasBeenCalled)
             document.getElementById('result').innerHTML = "SUCCESS"
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
   </script>
   <script src="THIS_FILE_DOES_NOT_EXIST.js" type="text/javascript"></script>

diff --git a/LayoutTests/http/tests/appcache/destroyed-frame.html b/LayoutTests/http/tests/appcache/destroyed-frame.html
index c1dd731c8670f8974fd0b2332d14a9f955ad5e91..6c1b63b62c11b98610fcdcd23e7d07349868fbb9 100644 (file)
--- a/LayoutTests/http/tests/appcache/destroyed-frame.html
+++ b/LayoutTests/http/tests/appcache/destroyed-frame.html
@@ -15,9 +15,9 @@ function gc()
     }
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var ifrCache;
@@ -45,8 +45,8 @@ function test()
         try { ifrCache.update(); } catch (ex) { }
         try { ifrCache.swapCache(); } catch (ex) { }
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }, 0);
 }
 </script>

diff --git a/LayoutTests/http/tests/appcache/detached-iframe.html b/LayoutTests/http/tests/appcache/detached-iframe.html
index ce6aecf64f20c57f64abd7ac382cad5bd3cb175f..c0842b73f56824944e6141982d2f4e0bc221030e 100644 (file)
--- a/LayoutTests/http/tests/appcache/detached-iframe.html
+++ b/LayoutTests/http/tests/appcache/detached-iframe.html
@@ -2,8 +2,8 @@
 <p>Test that accessing a detached iframe's applicationCache window property doesn't assert. If you don't see an assert, it passed.</p>
 <iframe src="about:blank"></iframe>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function test()
 {

diff --git a/LayoutTests/http/tests/appcache/different-https-origin-resource-main.html b/LayoutTests/http/tests/appcache/different-https-origin-resource-main.html
index 55e744fb1321d760d1d7eb421e2f17b11e5f5599..6a44aef24d25546476ccde83246a1d0c34c12414 100644 (file)
--- a/LayoutTests/http/tests/appcache/different-https-origin-resource-main.html
+++ b/LayoutTests/http/tests/appcache/different-https-origin-resource-main.html
@@ -1,15 +1,15 @@
 <html>
 <body>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
 }
 
 window.addEventListener("message", function(e) {
     document.getElementById("result").innerHTML = e.data; 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }, false);
 </script>
 <p>Test that a resource from a different https origin is not cached.</p>

diff --git a/LayoutTests/http/tests/appcache/different-origin-manifest.html b/LayoutTests/http/tests/appcache/different-origin-manifest.html
index b58c10a02264e7bb02a01cd542d91b0b46e7dd54..293bfc4e1848bdde6b9864f65be59c58e73ac49b 100644 (file)
--- a/LayoutTests/http/tests/appcache/different-origin-manifest.html
+++ b/LayoutTests/http/tests/appcache/different-origin-manifest.html
@@ -2,9 +2,9 @@
 <p>Test that a different origin manifest is completely ignored.</p>
 <div id=result></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
 }
 
 var result = document.getElementById("result");
@@ -27,8 +27,8 @@ function done()
     if (result.innerHTML == originalResult)
         result.innerHTML = applicationCache.status == applicationCache.UNCACHED ? "PASS" : "FAIL: cache status in not UNCACHED";
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 setTimeout(done, 100);

diff --git a/LayoutTests/http/tests/appcache/different-scheme.html b/LayoutTests/http/tests/appcache/different-scheme.html
index c87409773c7fc11d0ce839c632c05e9599933ffc..7c69a5c7ad394645a965ea4b27ad5fb735dc231b 100644 (file)
--- a/LayoutTests/http/tests/appcache/different-scheme.html
+++ b/LayoutTests/http/tests/appcache/different-scheme.html
@@ -2,9 +2,9 @@
 <body>
 <p>Test that application cache doesn't block loading resources with different schemes.</p>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function test()
@@ -17,8 +17,8 @@ function test()
 function success()
 {
     document.body.replaceChild(document.createTextNode("SUCCESS"), document.getElementsByTagName("iframe")[0]);
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.oncached = test;

diff --git a/LayoutTests/http/tests/appcache/disabled.html b/LayoutTests/http/tests/appcache/disabled.html
index e89752a57fa85c5440ede978cba2b87983770e68..9389cd53574e738f6d478141dceb4d9f567f0a96 100644 (file)
--- a/LayoutTests/http/tests/appcache/disabled.html
+++ b/LayoutTests/http/tests/appcache/disabled.html
@@ -3,9 +3,9 @@
 <p>Test to ensure the the window.applicationCache attribute is defined but non-functional with the feature disabled.</p>
 <div id=result></div>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.overridePreference("WebKitOfflineWebApplicationCacheEnabled", false);
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.overridePreference("WebKitOfflineWebApplicationCacheEnabled", false);
+        testRunner.dumpAsText();
     }
 
     function log(message)

diff --git a/LayoutTests/http/tests/appcache/document-write-html-element-2.html b/LayoutTests/http/tests/appcache/document-write-html-element-2.html
index bee9fe0b1c3ba6d858d15ecec2bd9fa766ee6a0d..36cbd628ada345223669a3a377ff0586161a469a 100644 (file)
--- a/LayoutTests/http/tests/appcache/document-write-html-element-2.html
+++ b/LayoutTests/http/tests/appcache/document-write-html-element-2.html
@@ -1,8 +1,8 @@
 <html manifest="resources/document-write-html-element.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function test()
@@ -10,8 +10,8 @@ function test()
     document.write("SUCCESS, no assertion failure");
     document.write("<br>applicationCache.status == " + applicationCache.status);
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.oncached = test;

diff --git a/LayoutTests/http/tests/appcache/document-write-html-element.html b/LayoutTests/http/tests/appcache/document-write-html-element.html
index 83954bb1da90b197c12a9b02d5b1f68b6f9ac34e..ad6afdc10174a9a9fb4fcaa13f78d7017aff610c 100644 (file)
--- a/LayoutTests/http/tests/appcache/document-write-html-element.html
+++ b/LayoutTests/http/tests/appcache/document-write-html-element.html
@@ -1,7 +1,7 @@
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 window.onload = function()
@@ -19,8 +19,8 @@ window.onload = function()
 
     setTimeout(function() {
         document.write("DONE. Passed if there were no alerts displayed.");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }, 100);
 }
 </script>

diff --git a/LayoutTests/http/tests/appcache/dynamic-entries-no-cache.html-disabled b/LayoutTests/http/tests/appcache/dynamic-entries-no-cache.html-disabled
index ed6e5997f9f1401f8a5cdc91f6c5a351b920a689..efbfa98fe8411595c4599238ec63a1c3588f91b1 100644 (file)
--- a/LayoutTests/http/tests/appcache/dynamic-entries-no-cache.html-disabled
+++ b/LayoutTests/http/tests/appcache/dynamic-entries-no-cache.html-disabled
@@ -3,8 +3,8 @@
 is not associated with any cache.</p>
 <div id="result"></div>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(message)
 {

diff --git a/LayoutTests/http/tests/appcache/empty-manifest.html b/LayoutTests/http/tests/appcache/empty-manifest.html
index 67752e6b27681e9d8976c93f464275732e34d1bf..afdc0f626eaddf3c0d83f2f15cd883f954dc7a0c 100644 (file)
--- a/LayoutTests/http/tests/appcache/empty-manifest.html
+++ b/LayoutTests/http/tests/appcache/empty-manifest.html
@@ -4,17 +4,17 @@
 <div id="result">FAILURE</div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function cached()
 {
     document.getElementById('result').innerHTML = 'SUCCESS';
     
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', cached, false);

diff --git a/LayoutTests/http/tests/appcache/fail-on-update-2.html b/LayoutTests/http/tests/appcache/fail-on-update-2.html
index fcbc3dde33f30291e9ddb68803c276f21e6c2948..fa81f9d450161e60d94d82d9409655e1f0a655cc 100644 (file)
--- a/LayoutTests/http/tests/appcache/fail-on-update-2.html
+++ b/LayoutTests/http/tests/appcache/fail-on-update-2.html
@@ -1,8 +1,8 @@
 <html manifest="resources/fail-on-update-2.php">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function setManifestDeleted(state)
@@ -36,8 +36,8 @@ function subframeLoaded()
 {
     if (!--subframesLeft) {
         document.write('<p>SUCCESS: No crash.</p>');
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 

diff --git a/LayoutTests/http/tests/appcache/fail-on-update.html b/LayoutTests/http/tests/appcache/fail-on-update.html
index b021fcc72ce7d06c251d43945ee5bf8d70f3e37d..94ffca3b9925d031bd8722347c5cbefe576c1d91 100644 (file)
--- a/LayoutTests/http/tests/appcache/fail-on-update.html
+++ b/LayoutTests/http/tests/appcache/fail-on-update.html
@@ -1,8 +1,8 @@
 <html manifest="resources/fail-on-update.php">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function setManifestDeleted(state)
@@ -20,7 +20,7 @@ function test()
     applicationCache.update();
     window.location = 'data:text/html,<p>SUCCESS: No crash.</p>' + 
         '<script>' +
-            'if (window.layoutTestController) layoutTestController.notifyDone();' +
+            'if (window.testRunner) testRunner.notifyDone();' +
         '</scri' + 'pt>';
 }
 

diff --git a/LayoutTests/http/tests/appcache/fallback.html b/LayoutTests/http/tests/appcache/fallback.html
index ed641e07a139459216c91c003779532b4a2bc16b..20ad0e2c5ad4c1b009d50fc4ee477bb21cabda76 100644 (file)
--- a/LayoutTests/http/tests/appcache/fallback.html
+++ b/LayoutTests/http/tests/appcache/fallback.html
@@ -5,9 +5,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var hadError = false;
@@ -142,8 +142,8 @@ function test6()
     }
 
     log(hadError ? "FAILURE" : "SUCCESS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.onnoupdate = function() { test() }

diff --git a/LayoutTests/http/tests/appcache/foreign-fallback.html b/LayoutTests/http/tests/appcache/foreign-fallback.html
index 7a80046d3a8ac74f01ed6d2b7e7a8bdfd1e1f5c6..23ad82e90929c68c6649661f9a36726a4a11c6b2 100644 (file)
--- a/LayoutTests/http/tests/appcache/foreign-fallback.html
+++ b/LayoutTests/http/tests/appcache/foreign-fallback.html
@@ -4,9 +4,9 @@
 Application Cache crash when a fallback document has a manifest URL.</p>
 <div id="result">Testing...</div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
 }
 
 
@@ -34,8 +34,8 @@ function frameDone()
         else
             throw "Try again";
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     } catch (ex) {
         // Not done yet.
         setTimeout(frameDone, 100);

diff --git a/LayoutTests/http/tests/appcache/foreign-iframe-main.html b/LayoutTests/http/tests/appcache/foreign-iframe-main.html
index a543eef5f4ec779f2012f280bfdbb11495562074..5ba687f8cf4894257a74ce58739af603451306cb 100644 (file)
--- a/LayoutTests/http/tests/appcache/foreign-iframe-main.html
+++ b/LayoutTests/http/tests/appcache/foreign-iframe-main.html
@@ -5,9 +5,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -32,7 +32,7 @@ applicationCache.addEventListener('obsolete', function() { log("obsolete") }, fa
 applicationCache.addEventListener('noupdate', function() { log("noupdate"); test() }, false);
 applicationCache.addEventListener('cached', function() { log("cached"); test() }, false);
 
-window.addEventListener("message", function() { log("SUCCESS"); if (window.layoutTestController) layoutTestController.notifyDone() }, false);
+window.addEventListener("message", function() { log("SUCCESS"); if (window.testRunner) testRunner.notifyDone() }, false);
 
 </script>
 </body>

diff --git a/LayoutTests/http/tests/appcache/idempotent-update.html b/LayoutTests/http/tests/appcache/idempotent-update.html
index 652369d14f621efa83bdf5d3d6274eda3a9e545c..0fad0e4be6784dd3cf23e434c5cb0b88aadcb2a8 100644 (file)
--- a/LayoutTests/http/tests/appcache/idempotent-update.html
+++ b/LayoutTests/http/tests/appcache/idempotent-update.html
@@ -5,9 +5,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -40,8 +40,8 @@ function done()
 {
     setTimeout(function() {
         log("DONE");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }, 10);
 }
 

diff --git a/LayoutTests/http/tests/appcache/insert-html-element-with-manifest-2.html b/LayoutTests/http/tests/appcache/insert-html-element-with-manifest-2.html
index 539d28bc548409392ef84d3b14e0cd2d2360805f..4539ca6dd0b900f5bae2248538b2cd5c1ae4140c 100644 (file)
--- a/LayoutTests/http/tests/appcache/insert-html-element-with-manifest-2.html
+++ b/LayoutTests/http/tests/appcache/insert-html-element-with-manifest-2.html
@@ -1,9 +1,9 @@
 <html>
 <div></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var div = document.getElementsByTagName("div")[0];
@@ -23,8 +23,8 @@ window.onload = function()
 
     setTimeout(function() {
         document.write("DONE. Passed if there were no alerts displayed.");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }, 100);
 }
 </script>

diff --git a/LayoutTests/http/tests/appcache/insert-html-element-with-manifest.html b/LayoutTests/http/tests/appcache/insert-html-element-with-manifest.html
index 694392cb1d5b43485962c77b0feb76b7a4ed4e5b..fc498220cc7c50678c40f2f60c1f9c96269a028d 100644 (file)
--- a/LayoutTests/http/tests/appcache/insert-html-element-with-manifest.html
+++ b/LayoutTests/http/tests/appcache/insert-html-element-with-manifest.html
@@ -1,8 +1,8 @@
 <html>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 document.removeChild(document.documentElement);
@@ -24,8 +24,8 @@ window.onload = function()
 
     setTimeout(function() {
         document.write("DONE. Passed if there were no alerts displayed.");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }, 100);
 }
 </script>

diff --git a/LayoutTests/http/tests/appcache/interrupted-update.html b/LayoutTests/http/tests/appcache/interrupted-update.html
index 363ac2b5c1d7762ea3dc034869a902bcc4bb43fa..6576be3ade201a71da68ec33fdfb1d2a0519e7a1 100644 (file)
--- a/LayoutTests/http/tests/appcache/interrupted-update.html
+++ b/LayoutTests/http/tests/appcache/interrupted-update.html
@@ -2,9 +2,9 @@
 <p>Test that an application cache update works again after interruption.</p>
 <pre id=log></pre>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(msg)
@@ -43,24 +43,24 @@ function onnoupdate()
 {
     log("NOUPDATE");
     log("\nFAIL - the cache was already present, so we couldn't test initial loading");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function oncached()
 {
     log("CACHED");
     log("\nPASS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function onerror()
 {
     log("ERROR");
     log("\nFAIL");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 

diff --git a/LayoutTests/http/tests/appcache/load-from-appcache-defer-resume-crash.html b/LayoutTests/http/tests/appcache/load-from-appcache-defer-resume-crash.html
index 7c4011efeeee9945ea99abaef0fac3abdd1582ab..980ff486202f243baf5c524d00e11e2b0115033d 100644 (file)
--- a/LayoutTests/http/tests/appcache/load-from-appcache-defer-resume-crash.html
+++ b/LayoutTests/http/tests/appcache/load-from-appcache-defer-resume-crash.html
@@ -1,16 +1,16 @@
 <html manifest="resources/load-from-appcache-defer-resume-crash.manifest">
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.setUseDeferredFrameLoading(true)
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.setUseDeferredFrameLoading(true)
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 function finishIfNeeded() {
     if (window.location.hash) {
         document.getElementById('result').innerText = "SUCCESS";
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 function run() {

diff --git a/LayoutTests/http/tests/appcache/local-content.html b/LayoutTests/http/tests/appcache/local-content.html
index 07875675c7b6d6841e950b195c91bea2a54875e6..8829931b042af0b3630eb201536efe6a02561c7a 100644 (file)
--- a/LayoutTests/http/tests/appcache/local-content.html
+++ b/LayoutTests/http/tests/appcache/local-content.html
@@ -4,9 +4,9 @@
 <p>Should say SUCCESS:</p>
 <div id="result"></div>
 <script type="text/javascript">
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -21,8 +21,8 @@ function noupdate()
     ifr.onload = frameCreated;
     setTimeout(function() {
         log("SUCCESS");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
         }, 300);
         
     document.body.appendChild(ifr);
@@ -31,8 +31,8 @@ function noupdate()
 function frameCreated()
 {
     log("FAILURE: A local resource was opened in an iframe");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function reload()

diff --git a/LayoutTests/http/tests/appcache/main-resource-hash.html b/LayoutTests/http/tests/appcache/main-resource-hash.html
index 6dbce36b2770925a57e25de72c6a3f0f934cd9a0..7006076653a231bb5dd09a8a55dbe688b2ed8d84 100644 (file)
--- a/LayoutTests/http/tests/appcache/main-resource-hash.html
+++ b/LayoutTests/http/tests/appcache/main-resource-hash.html
@@ -5,9 +5,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -33,8 +33,8 @@ function frameCreated()
     } else {
         log("SUCCESS");
         setNetworkEnabled(true);
-        if (window.layoutTestController)
-            layoutTestController.notifyDone()
+        if (window.testRunner)
+            testRunner.notifyDone()
     }
 }
 

diff --git a/LayoutTests/http/tests/appcache/main-resource-redirect.html b/LayoutTests/http/tests/appcache/main-resource-redirect.html
index e84dc9fb9cd4f95ab536bfce536153d6aabc812c..0fa3d214ffc50d8229300c9d69f138390842b825 100644 (file)
--- a/LayoutTests/http/tests/appcache/main-resource-redirect.html
+++ b/LayoutTests/http/tests/appcache/main-resource-redirect.html
@@ -3,9 +3,9 @@
 <p>Test that application cache is consulted again after a redirect response.</p>
 <div id="result">Testing...</div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
 }
 
 function setNetworkEnabled(state)
@@ -27,9 +27,9 @@ function test()
 
 function done()
 {
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         applicationCache.onerror = null;
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     }
     setNetworkEnabled(true);
 }

diff --git a/LayoutTests/http/tests/appcache/manifest-containing-itself.html b/LayoutTests/http/tests/appcache/manifest-containing-itself.html
index 89a54108c457059985e5d365c87c82a1cc4d88f9..92c7746f4519906c4b36f8bbbdc785079ca1835a 100644 (file)
--- a/LayoutTests/http/tests/appcache/manifest-containing-itself.html
+++ b/LayoutTests/http/tests/appcache/manifest-containing-itself.html
@@ -4,17 +4,17 @@
 <div id="result">FAILURE</div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function cached()
 {
     document.getElementById('result').innerHTML = 'SUCCESS';
     
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', cached, false);

diff --git a/LayoutTests/http/tests/appcache/manifest-parsing.html b/LayoutTests/http/tests/appcache/manifest-parsing.html
index 46a7fddc173da8886ec9430e1fc0acf6cb074730..b5006940f35a3fe92571398a09ea80328c9bd59a 100644 (file)
--- a/LayoutTests/http/tests/appcache/manifest-parsing.html
+++ b/LayoutTests/http/tests/appcache/manifest-parsing.html
@@ -4,9 +4,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -53,8 +53,8 @@ function test()
     }
 
     log(hadError ? "FAILURE" : "SUCCESS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.onnoupdate = function() { test() }

diff --git a/LayoutTests/http/tests/appcache/manifest-redirect-2.html b/LayoutTests/http/tests/appcache/manifest-redirect-2.html
index 7c00d41aabff0b7aa09c4725b409cfa7e54cca3d..939ef422299e9d1da9da05e9d773e893b6ccf700 100644 (file)
--- a/LayoutTests/http/tests/appcache/manifest-redirect-2.html
+++ b/LayoutTests/http/tests/appcache/manifest-redirect-2.html
@@ -4,9 +4,9 @@
 <p>Should say SUCCESS:</p>
 <div id=result></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -27,8 +27,8 @@ function test()
     else
         log("SUCCESS");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', function() { log("cached"); cacheCallback() }, false);

diff --git a/LayoutTests/http/tests/appcache/manifest-redirect.html b/LayoutTests/http/tests/appcache/manifest-redirect.html
index 3f75547f963a6b9759c472070fd3d20c8d910146..9f16d18402926b4177e3203b9016e2837ac655c5 100644 (file)
--- a/LayoutTests/http/tests/appcache/manifest-redirect.html
+++ b/LayoutTests/http/tests/appcache/manifest-redirect.html
@@ -4,9 +4,9 @@
 <p>Should say SUCCESS:</p>
 <div id=result></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -27,8 +27,8 @@ function test()
     else
         log("SUCCESS");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', function() { log("cached"); cacheCallback() }, false);

diff --git a/LayoutTests/http/tests/appcache/manifest-with-empty-file.html b/LayoutTests/http/tests/appcache/manifest-with-empty-file.html
index b9ae0514eba57bfdc57394fa3b56f83c526dc26e..43015a78cb18905218c1be9bc74993f97875bdfa 100644 (file)
--- a/LayoutTests/http/tests/appcache/manifest-with-empty-file.html
+++ b/LayoutTests/http/tests/appcache/manifest-with-empty-file.html
@@ -2,16 +2,16 @@
 <div>This tests that a manifest that contains an empty file will not crash the browser.</div>
 <div id="result">FAILURE</div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function cached()
 {
     document.getElementById('result').innerHTML = 'SUCCESS';
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', cached, false);

diff --git a/LayoutTests/http/tests/appcache/max-size.html b/LayoutTests/http/tests/appcache/max-size.html
index 8f4e8552340ebe3331d46200ef386bbca4d9e1f6..e6127d04a7394fd6e3b02fe3963defd3fcba31ba 100644 (file)
--- a/LayoutTests/http/tests/appcache/max-size.html
+++ b/LayoutTests/http/tests/appcache/max-size.html
@@ -1,18 +1,18 @@
 <html manifest="resources/maxsize.manifest">
 <body>\r
 <script>\r
-    if (window.layoutTestController) {
-        layoutTestController.setAppCacheMaximumSize(10 * 1024);
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.setAppCacheMaximumSize(10 * 1024);
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function log(message)
     {
         document.getElementById("result").innerHTML += message + "<br>";
-        if (window.layoutTestController) {
-            layoutTestController.setAppCacheMaximumSize(100 * 1024 * 1024);
-            layoutTestController.notifyDone();
+        if (window.testRunner) {
+            testRunner.setAppCacheMaximumSize(100 * 1024 * 1024);
+            testRunner.notifyDone();
         }
     }
 

diff --git a/LayoutTests/http/tests/appcache/navigating-away-while-cache-attempt-in-progress.html b/LayoutTests/http/tests/appcache/navigating-away-while-cache-attempt-in-progress.html
index 7e7920a1be3a8693f82682ab19542363c4fc8ad2..c17c8f914421d4a4115407ec7111a07883b3bdf8 100644 (file)
--- a/LayoutTests/http/tests/appcache/navigating-away-while-cache-attempt-in-progress.html
+++ b/LayoutTests/http/tests/appcache/navigating-away-while-cache-attempt-in-progress.html
@@ -1,14 +1,14 @@
 <html manifest="resources/navigating-away-while-cache-attempt-in-progress.manifest">
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function navigateAway() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
     else
         window.location.href = "about:blank"
 }

diff --git a/LayoutTests/http/tests/appcache/non-html.xhtml b/LayoutTests/http/tests/appcache/non-html.xhtml
index c30cc45594ca335fd38dadcebc5ee06e90b4d350..f377d95747a73ed1905c800f25cb30e931e61533 100644 (file)
--- a/LayoutTests/http/tests/appcache/non-html.xhtml
+++ b/LayoutTests/http/tests/appcache/non-html.xhtml
@@ -6,9 +6,9 @@
 <p>Should say SUCCESS:</p>
 <div id="result"></div>
 <script type="text/javascript">
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -82,9 +82,9 @@ function frameCreated()
     else
         log("FAIL: Frame.onload was called, but the image doesn't seem to be loaded.");
     
-    if (window.layoutTestController) {
+    if (window.testRunner) {
         applicationCache.onerror = null;
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     }
 }
 

diff --git a/LayoutTests/http/tests/appcache/offline-access.html b/LayoutTests/http/tests/appcache/offline-access.html
index 45e9d4e018e21fa9d8e9333cac6526440c911dfe..4b33f0cad72a76edf22c26c2187230bbc81f9ef8 100644 (file)
--- a/LayoutTests/http/tests/appcache/offline-access.html
+++ b/LayoutTests/http/tests/appcache/offline-access.html
@@ -5,9 +5,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -41,8 +41,8 @@ function frameCreated()
         createFrame();
     } else {
         log("SUCCESS");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone()
+        if (window.testRunner)
+            testRunner.notifyDone()
     }
 }
 

diff --git a/LayoutTests/http/tests/appcache/online-fallback-layering.html b/LayoutTests/http/tests/appcache/online-fallback-layering.html
index bc607eeb51ed788655cfc1e38c9957051b453fc8..5b3a69957ada0c5a080a9c0aef6d99024e3996c4 100644 (file)
--- a/LayoutTests/http/tests/appcache/online-fallback-layering.html
+++ b/LayoutTests/http/tests/appcache/online-fallback-layering.html
@@ -2,9 +2,9 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message) {
@@ -13,8 +13,8 @@ function log(message) {
 
 function testComplete(result) {
     log(result);
-    if (window.layoutTestController)
-       layoutTestController.notifyDone();
+    if (window.testRunner)
+       testRunner.notifyDone();
 }
 
 function syncGet(url) {

diff --git a/LayoutTests/http/tests/appcache/online-whitelist.html b/LayoutTests/http/tests/appcache/online-whitelist.html
index f33fb6d4686749420a06372a2f0b58b6a6e9a10a..e58812b72a4f73d7193ae0adf419bc14bc924b92 100644 (file)
--- a/LayoutTests/http/tests/appcache/online-whitelist.html
+++ b/LayoutTests/http/tests/appcache/online-whitelist.html
@@ -4,9 +4,9 @@
 
 <div id="result"></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -65,8 +65,8 @@ function test()
 
     log(hadError ? "FAIL" : "PASS");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', test, false);

diff --git a/LayoutTests/http/tests/appcache/origin-delete.html b/LayoutTests/http/tests/appcache/origin-delete.html
index 26c4890764166e10386e797ca6c024b6ab6658a0..b1e87655333a3d48a610df7ede2a64ceb45d3062 100644 (file)
--- a/LayoutTests/http/tests/appcache/origin-delete.html
+++ b/LayoutTests/http/tests/appcache/origin-delete.html
@@ -11,19 +11,19 @@ function log(message) {
 // Start and end.
 
 function startTest() {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllApplicationCaches();
-        layoutTestController.dumpApplicationCacheDelegateCallbacks();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllApplicationCaches();
+        testRunner.dumpApplicationCacheDelegateCallbacks();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     addIFrameWithAppCache();
 }
 
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function addIFrameWithAppCache() {
@@ -36,7 +36,7 @@ function addIFrameWithAppCache() {
         log(event.data);
         if (event.data === "PASS - cached iframe-1") {
             log("clearing cache for origin");
-            layoutTestController.clearApplicationCacheForOrigin("http://127.0.0.1:8000");
+            testRunner.clearApplicationCacheForOrigin("http://127.0.0.1:8000");
             var frame = document.getElementById('cachedFrame');
             frame.contentWindow.postMessage("appcache_status", "*");
         } else if (event.data === "appcache_status=5"){

diff --git a/LayoutTests/http/tests/appcache/origin-quota-continued-download-multiple-manifests.html b/LayoutTests/http/tests/appcache/origin-quota-continued-download-multiple-manifests.html
index 49d6b4546b355ee8b822994e6ed2da64a7f383cb..aec74ebe1d1e88a9bf9e9505e883da29b3cffee7 100644 (file)
--- a/LayoutTests/http/tests/appcache/origin-quota-continued-download-multiple-manifests.html
+++ b/LayoutTests/http/tests/appcache/origin-quota-continued-download-multiple-manifests.html
@@ -11,20 +11,20 @@ function log(message) {
 // Start and end.
 
 function startTest() {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllApplicationCaches();
-        layoutTestController.dumpApplicationCacheDelegateCallbacks();
-        layoutTestController.setApplicationCacheOriginQuota(20*1024);
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllApplicationCaches();
+        testRunner.dumpApplicationCacheDelegateCallbacks();
+        testRunner.setApplicationCacheOriginQuota(20*1024);
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     addFirstIFrame();
 }
 
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 // Stages.

diff --git a/LayoutTests/http/tests/appcache/origin-quota-continued-download.html b/LayoutTests/http/tests/appcache/origin-quota-continued-download.html
index 801190252b8b2462a33d6a1e51c3a4f9b0ab9bb2..b880c3d209278a155761e2ca333ac7924ed347d1 100644 (file)
--- a/LayoutTests/http/tests/appcache/origin-quota-continued-download.html
+++ b/LayoutTests/http/tests/appcache/origin-quota-continued-download.html
@@ -11,20 +11,20 @@ function log(message) {
 // Start and end.
 
 function startTest() {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllApplicationCaches();
-        layoutTestController.dumpApplicationCacheDelegateCallbacks();
-        layoutTestController.setApplicationCacheOriginQuota(1024);
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllApplicationCaches();
+        testRunner.dumpApplicationCacheDelegateCallbacks();
+        testRunner.setApplicationCacheOriginQuota(1024);
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     addIFrame();
 }
 
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 // Stages.

diff --git a/LayoutTests/http/tests/appcache/origin-quota.html b/LayoutTests/http/tests/appcache/origin-quota.html
index f00900ef4546f3f18763a7ba30ae03456cfc4153..46d86d9551315a423a0b0a57e180e1d541585cfd 100644 (file)
--- a/LayoutTests/http/tests/appcache/origin-quota.html
+++ b/LayoutTests/http/tests/appcache/origin-quota.html
@@ -11,21 +11,21 @@ function log(message) {
 // Start and end.
 
 function startTest() {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllApplicationCaches();
-        layoutTestController.dumpApplicationCacheDelegateCallbacks();
-        layoutTestController.disallowIncreaseForApplicationCacheQuota();
-        layoutTestController.setApplicationCacheOriginQuota(20*1024);
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllApplicationCaches();
+        testRunner.dumpApplicationCacheDelegateCallbacks();
+        testRunner.disallowIncreaseForApplicationCacheQuota();
+        testRunner.setApplicationCacheOriginQuota(20*1024);
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     addFirstIFrame();
 }
 
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 // Stages.
@@ -49,7 +49,7 @@ function addSecondIFrame() {
     // Expected to fail, then increase the quota.
     addIFrameWithContinuation("resources/quota-origin-iframe-2.html", function(event) {
         log(event.data);
-        layoutTestController.setApplicationCacheOriginQuota(100*1024);
+        testRunner.setApplicationCacheOriginQuota(100*1024);
         addThirdIFrame();
     });
 }

diff --git a/LayoutTests/http/tests/appcache/origin-usage.html b/LayoutTests/http/tests/appcache/origin-usage.html
index dcd5aa60dd75b31b635f2df73cf2bd6cb997d1c7..acae45f1dc0ecc9132f2923ff00810cb728dcea6 100644 (file)
--- a/LayoutTests/http/tests/appcache/origin-usage.html
+++ b/LayoutTests/http/tests/appcache/origin-usage.html
@@ -13,20 +13,20 @@ function log(message) {
 // Start and end.
 
 function startTest() {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllApplicationCaches();
+    if (window.testRunner) {
+        testRunner.clearAllApplicationCaches();
         log("Cleared application cache");
-        layoutTestController.dumpApplicationCacheDelegateCallbacks();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+        testRunner.dumpApplicationCacheDelegateCallbacks();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     addFirstIFrame();
 }
 
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 // Stages.
@@ -42,7 +42,7 @@ function addFirstIFrame() {
     // Expected to succeed.
     addIFrameWithContinuation("resources/origin-usage-iframe-1.html", function(event) {
         log(event.data);
-        var usage = layoutTestController.applicationCacheDiskUsageForOrigin(drtURL);
+        var usage = testRunner.applicationCacheDiskUsageForOrigin(drtURL);
         log("Usage for " + drtURL + " after first frame is between 15000 and 16000 bytes: " + ((usage > 15000) && (usage < 16000)));
         addSecondIFrame();
     });
@@ -51,13 +51,13 @@ function addFirstIFrame() {
 function addSecondIFrame() {
     addIFrameWithContinuation("resources/origin-usage-iframe-2.html", function(event) {
         log(event.data);
-        var usage = layoutTestController.applicationCacheDiskUsageForOrigin(drtURL);
+        var usage = testRunner.applicationCacheDiskUsageForOrigin(drtURL);
         log("Usage for " + drtURL + " after second frame is between 30000 and 32000 bytes: " + ((usage > 30000) && (usage < 32000)));
 
         log("Removing Application Cache for " + drtURL);
-        layoutTestController.clearApplicationCacheForOrigin(drtURL);
+        testRunner.clearApplicationCacheForOrigin(drtURL);
 
-        log("Usage for " + drtURL + ": " + layoutTestController.applicationCacheDiskUsageForOrigin(drtURL));
+        log("Usage for " + drtURL + ": " + testRunner.applicationCacheDiskUsageForOrigin(drtURL));
 
         finishTest();
     });

diff --git a/LayoutTests/http/tests/appcache/origins-with-appcache.html b/LayoutTests/http/tests/appcache/origins-with-appcache.html
index 0730f12e5c3c791e732642209a1ff35428cfcc38..74aa3938493d0b3b0256e9bdffb946ce345772d6 100644 (file)
--- a/LayoutTests/http/tests/appcache/origins-with-appcache.html
+++ b/LayoutTests/http/tests/appcache/origins-with-appcache.html
@@ -10,7 +10,7 @@ function log(message) {
 
 function handleMessage(event) {
     if (event.data === "created_cache") {
-        log("Origins with application cache after frame was cached: " + layoutTestController.originsWithApplicationCache());
+        log("Origins with application cache after frame was cached: " + testRunner.originsWithApplicationCache());
     } else {
         log("received invalid message from frame '" + event.data + "'");
     }
@@ -28,12 +28,12 @@ function addIFrameWithCache()
 // Start and end.
 
 function startTest() {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllApplicationCaches();
-        log("Origins with application cache after deletion: " + layoutTestController.originsWithApplicationCache());
-        layoutTestController.dumpApplicationCacheDelegateCallbacks();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllApplicationCaches();
+        log("Origins with application cache after deletion: " + testRunner.originsWithApplicationCache());
+        testRunner.dumpApplicationCacheDelegateCallbacks();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     window.onmessage = handleMessage;
@@ -42,8 +42,8 @@ function startTest() {
 }
 
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 </script>

diff --git a/LayoutTests/http/tests/appcache/progress-counter.html b/LayoutTests/http/tests/appcache/progress-counter.html
index 0f9d0b6753c466361281b4a8b39728a7e289e675..df6daa2d6fcf02028d0774c258e9b93fe35b46a9 100644 (file)
--- a/LayoutTests/http/tests/appcache/progress-counter.html
+++ b/LayoutTests/http/tests/appcache/progress-counter.html
@@ -1,16 +1,16 @@
 <html manifest="resources/progress-counter.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 var expectedTotal = 2
 var eventsReceived = 0;
 
 function done() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function progress(event)

diff --git a/LayoutTests/http/tests/appcache/reload.html b/LayoutTests/http/tests/appcache/reload.html
index 6e2da56128b68436cedf096242f337f0aedfe548..47a49fceccc735989827a397e99e53092ce6976f 100644 (file)
--- a/LayoutTests/http/tests/appcache/reload.html
+++ b/LayoutTests/http/tests/appcache/reload.html
@@ -5,9 +5,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -27,8 +27,8 @@ function receivedMessage(message)
         state = 2;
         setTimeout("frames[0].test()", 0);
     } else if (state == 2) {
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 

diff --git a/LayoutTests/http/tests/appcache/remove-cache.html b/LayoutTests/http/tests/appcache/remove-cache.html
index 954418c281e46e962b2324f79f66dae66c2fdb3a..d9026d4166781f35efaf96fedb53b09ba1934b59 100644 (file)
--- a/LayoutTests/http/tests/appcache/remove-cache.html
+++ b/LayoutTests/http/tests/appcache/remove-cache.html
@@ -11,9 +11,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -84,8 +84,8 @@ function test4()
 function test5()
 {
     log("SUCCESS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function resetManifest()

diff --git a/LayoutTests/http/tests/appcache/resource-redirect-2.html b/LayoutTests/http/tests/appcache/resource-redirect-2.html
index cf0d3a8a96e28d06023f3e8f9d698086db713180..301788f4a3f308688bba6627421c480c1ffead40 100644 (file)
--- a/LayoutTests/http/tests/appcache/resource-redirect-2.html
+++ b/LayoutTests/http/tests/appcache/resource-redirect-2.html
@@ -4,9 +4,9 @@
 <p>Should say SUCCESS:</p>
 <div id=result></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -27,8 +27,8 @@ function test()
     else
         log("SUCCESS");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', function() { log("cached"); cacheCallback() }, false);

diff --git a/LayoutTests/http/tests/appcache/resource-redirect.html b/LayoutTests/http/tests/appcache/resource-redirect.html
index 7fdf5f83a9f221a994a2252d1fd106ea2185e19c..e28c4701314ab52c47c3dea43943dc2de17b2b74 100644 (file)
--- a/LayoutTests/http/tests/appcache/resource-redirect.html
+++ b/LayoutTests/http/tests/appcache/resource-redirect.html
@@ -4,9 +4,9 @@
 <p>Should say SUCCESS:</p>
 <div id=result></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -27,8 +27,8 @@ function test()
     else
         log("SUCCESS");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', function() { log("cached"); cacheCallback() }, false);

diff --git a/LayoutTests/http/tests/appcache/resources/access-via-redirect.html b/LayoutTests/http/tests/appcache/resources/access-via-redirect.html
index 510f8416b266d7c7343c8629366ae832b8c92e9e..945b85e1df26d05b95ef592a0dacc578e164f1fd 100644 (file)
--- a/LayoutTests/http/tests/appcache/resources/access-via-redirect.html
+++ b/LayoutTests/http/tests/appcache/resources/access-via-redirect.html
@@ -4,9 +4,9 @@
 <p id="result">FAILURE</p>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function canLoad(url)
@@ -35,8 +35,8 @@ function cached()
         
     document.getElementById('result').innerHTML = "SUCCESS"
     
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', cached, false);

diff --git a/LayoutTests/http/tests/appcache/resources/crash-when-navigating-away-then-back.html b/LayoutTests/http/tests/appcache/resources/crash-when-navigating-away-then-back.html
index 28bbeb36d70d2ae6d16627290176a7e8ea6a3a7b..fca8dd35c242fa3af591387752b180ff1417f1da 100644 (file)
--- a/LayoutTests/http/tests/appcache/resources/crash-when-navigating-away-then-back.html
+++ b/LayoutTests/http/tests/appcache/resources/crash-when-navigating-away-then-back.html
@@ -11,8 +11,8 @@ function noupdate()
 {
     window.opener.document.getElementById('result').innerHTML = 'SUCCESS';
     window.close();
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', cached, false);

diff --git a/LayoutTests/http/tests/appcache/simple.html b/LayoutTests/http/tests/appcache/simple.html
index 4342cb7a4096b467e22061853aee24d3562158c9..de473cf98b118396bcf59bdfaf1832c853e509bf 100644 (file)
--- a/LayoutTests/http/tests/appcache/simple.html
+++ b/LayoutTests/http/tests/appcache/simple.html
@@ -1,8 +1,8 @@
 <html manifest="resources/simple.manifest">
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function cached()
@@ -41,8 +41,8 @@ function cached()
     
     document.getElementById('result').innerHTML = "SUCCESS"
     
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', cached, false);

diff --git a/LayoutTests/http/tests/appcache/top-frame-1.html b/LayoutTests/http/tests/appcache/top-frame-1.html
index 9e29300af64ac9fcb3af4fcc51ddb8a5b84a489a..fa4caa380eb7d321784b8a4e307b51db8a5ce74b 100644 (file)
--- a/LayoutTests/http/tests/appcache/top-frame-1.html
+++ b/LayoutTests/http/tests/appcache/top-frame-1.html
@@ -8,9 +8,9 @@ anyway, so it can also pass if the UA fails to reject loads for cache misses.</p
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -31,7 +31,7 @@ applicationCache.addEventListener('cached', function() { test() }, false);
 applicationCache.onupdateready = function() { log("FAIL: received unexpected updateready event") }
 applicationCache.onerror = function() { log("FAIL: received unexpected error event") }
 
-window.addEventListener("message", function() { log("SUCCESS"); if (window.layoutTestController) layoutTestController.notifyDone() }, false);
+window.addEventListener("message", function() { log("SUCCESS"); if (window.testRunner) testRunner.notifyDone() }, false);
 
 </script>
 </body>

diff --git a/LayoutTests/http/tests/appcache/top-frame-2.html b/LayoutTests/http/tests/appcache/top-frame-2.html
index 71bd468ba3a300313d4c830e03159bfbb0d69ade..9ad32f07f2ab39cc669beed3250dac0ef60fdeec 100644 (file)
--- a/LayoutTests/http/tests/appcache/top-frame-2.html
+++ b/LayoutTests/http/tests/appcache/top-frame-2.html
@@ -6,9 +6,9 @@ contains its resource.</p>
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -19,7 +19,7 @@ function log(message)
 function debug(message)
 {
     // If running manually in the browser, print the sequence of events.
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         log(message);
 }
 
@@ -31,8 +31,8 @@ function checkDone()
 {
     if (receivedExpectedMessage && receivedCheckingEvent && receivedNoupdateEvent) {
         log("SUCCESS");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 

diff --git a/LayoutTests/http/tests/appcache/top-frame-3.html b/LayoutTests/http/tests/appcache/top-frame-3.html
index a2d2cc6c74cd5a46a08d654ad1ca00151781ccb6..1032d72a5b08fd50daa1f8ba5a674e4e7a2a52f2 100644 (file)
--- a/LayoutTests/http/tests/appcache/top-frame-3.html
+++ b/LayoutTests/http/tests/appcache/top-frame-3.html
@@ -6,9 +6,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -19,7 +19,7 @@ function log(message)
 function debug(message)
 {
     // If running manually in the browser, print the sequence of events.
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         log(message);
 }
 
@@ -31,8 +31,8 @@ function checkDone()
 {
     if (receivedExpectedMessage && receivedCheckingEventsCounter == 2 && receivedNoupdateEventsCounter == 2) {
         log("SUCCESS");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 

diff --git a/LayoutTests/http/tests/appcache/top-frame-4.html b/LayoutTests/http/tests/appcache/top-frame-4.html
index c36e0a3eeb7549ef77190414b37f238261a7dd62..6623bf49e50a2a26104cd0c83e333060e83b8e01 100644 (file)
--- a/LayoutTests/http/tests/appcache/top-frame-4.html
+++ b/LayoutTests/http/tests/appcache/top-frame-4.html
@@ -6,9 +6,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -19,7 +19,7 @@ function log(message)
 function debug(message)
 {
     // If running manually in the browser, print the sequence of events.
-    if (!window.layoutTestController)
+    if (!window.testRunner)
         log(message);
 }
 
@@ -31,8 +31,8 @@ function checkDone()
 {
     if (receivedExpectedMessage && receivedCheckingEventsCounter == 2 && receivedNoupdateEventsCounter == 2) {
         log("SUCCESS");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 }
 

diff --git a/LayoutTests/http/tests/appcache/update-cache.html b/LayoutTests/http/tests/appcache/update-cache.html
index dd48b0199eead6134014f766804c269151f57257..df631300af8969e8f56394bf0b08d4aa65f98ee8 100644 (file)
--- a/LayoutTests/http/tests/appcache/update-cache.html
+++ b/LayoutTests/http/tests/appcache/update-cache.html
@@ -4,9 +4,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -54,8 +54,8 @@ function test3()
     log((applicationCache.status == applicationCache.IDLE) ? "Cache status is IDLE" : ("FAIL: Incorrect cache status, " + applicationCache.status));
 
     log("DONE");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.oncached = test;

diff --git a/LayoutTests/http/tests/appcache/whitelist-wildcard.html b/LayoutTests/http/tests/appcache/whitelist-wildcard.html
index 01bc892bde32192bd0212f4ba3700e3bd58f18fb..77fab60aa1ff48448dd38aec049797c7e3452ca5 100644 (file)
--- a/LayoutTests/http/tests/appcache/whitelist-wildcard.html
+++ b/LayoutTests/http/tests/appcache/whitelist-wildcard.html
@@ -2,9 +2,9 @@
 <body>
 <p>Test that online whitelist wildcard flag is implemented.</p>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function test()
@@ -17,8 +17,8 @@ function test()
     } catch (ex) {
         document.body.appendChild(document.createTextNode(ex));
     }
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.oncached = test;

diff --git a/LayoutTests/http/tests/appcache/wrong-content-type.html b/LayoutTests/http/tests/appcache/wrong-content-type.html
index 8a527aa98555b7d425bbbea4e58b1c92cdeb2048..5b2fd73402e2f7c7f8bdab68d22cf6016acc1597 100644 (file)
--- a/LayoutTests/http/tests/appcache/wrong-content-type.html
+++ b/LayoutTests/http/tests/appcache/wrong-content-type.html
@@ -4,9 +4,9 @@
 <p>Should say SUCCESS:</p>
 <div id=result></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -17,8 +17,8 @@ function log(message)
 function errorEventListener()
 {
     log("FAILURE: An error event was dispatched on window.applicationCache.");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function verifyStatus()
@@ -28,8 +28,8 @@ function verifyStatus()
     else
         log("SUCCESS");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', verifyStatus, false);

diff --git a/LayoutTests/http/tests/appcache/wrong-signature-2.html b/LayoutTests/http/tests/appcache/wrong-signature-2.html
index 9b26d02dcea93d3e7f5b55f33338ca84200e3c6d..fd6da7f375fc9d530151b5606e12e0aeedb9db5f 100644 (file)
--- a/LayoutTests/http/tests/appcache/wrong-signature-2.html
+++ b/LayoutTests/http/tests/appcache/wrong-signature-2.html
@@ -4,9 +4,9 @@
 <p>Should say SUCCESS:</p>
 <div id=result></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -27,8 +27,8 @@ function test()
     else
         log("SUCCESS");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', function() { log("cached"); cacheCallback() }, false);

diff --git a/LayoutTests/http/tests/appcache/wrong-signature.html b/LayoutTests/http/tests/appcache/wrong-signature.html
index 3b5f747d3c5fa3ce76eaa2228019bf6bdb4bc1c1..9a965917e8fcc1a471ce4a9c8b9de67ba5c2ea19 100644 (file)
--- a/LayoutTests/http/tests/appcache/wrong-signature.html
+++ b/LayoutTests/http/tests/appcache/wrong-signature.html
@@ -4,9 +4,9 @@
 <p>Should say SUCCESS:</p>
 <div id=result></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText()
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText()
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -27,8 +27,8 @@ function test()
     else
         log("SUCCESS");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 applicationCache.addEventListener('cached', function() { log("cached"); cacheCallback() }, false);

diff --git a/LayoutTests/http/tests/appcache/xhr-foreign-resource.html b/LayoutTests/http/tests/appcache/xhr-foreign-resource.html
index df08d3fe814cc1cac95275aaefeb7b27596569b8..5d9fe46fe7241634aa59e16eed6a4df7eae4fe3d 100644 (file)
--- a/LayoutTests/http/tests/appcache/xhr-foreign-resource.html
+++ b/LayoutTests/http/tests/appcache/xhr-foreign-resource.html
@@ -5,9 +5,9 @@
 <div id=result></div>
 
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(message)
@@ -68,8 +68,8 @@ function test(evt)
     } else 
         log("FAIL: subframe didn't get a correct cache");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 window.addEventListener("message", frameMessageReceived, false);

diff --git a/LayoutTests/http/tests/cache/cancel-during-failure-crash.html b/LayoutTests/http/tests/cache/cancel-during-failure-crash.html
index 226dfe85ec95a70fbfbf19be5df433b8d459b9d9..ae57eb12caf3118402e8a328acd2b19381f7324c 100644 (file)
--- a/LayoutTests/http/tests/cache/cancel-during-failure-crash.html
+++ b/LayoutTests/http/tests/cache/cancel-during-failure-crash.html
@@ -1,9 +1,9 @@
 <html>
 <body>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var img = new Image();
@@ -11,7 +11,7 @@ img.onerror = function() {
     // cancel resource load within didFail()
     window.stop();
     document.body.appendChild(document.createTextNode("PASS"));
-    layoutTestController.notifyDone();
+    testRunner.notifyDone();
 }
 
 // Port 7 will likely refuse the connection, causing a didFail()

diff --git a/LayoutTests/http/tests/cache/cancel-during-revalidation-succeeded.html b/LayoutTests/http/tests/cache/cancel-during-revalidation-succeeded.html
index 74eeb5042b9b605929c001684e98a98652c20e55..283e65290f3e8eb6299ffc951b8937b8e4506bb1 100644 (file)
--- a/LayoutTests/http/tests/cache/cancel-during-revalidation-succeeded.html
+++ b/LayoutTests/http/tests/cache/cancel-during-revalidation-succeeded.html
@@ -7,9 +7,9 @@ It's possible for a successful revalidation to cause events to fire synchronousl
 We shouldn't crash if one of those events stops the load.\r
 See https://bugs.webkit.org/show_bug.cgi?id=72762.\r
 <script>\r
-if (window.layoutTestController) {\r
-    layoutTestController.dumpAsText();\r
-    layoutTestController.waitUntilDone();\r
+if (window.testRunner) {\r
+    testRunner.dumpAsText();\r
+    testRunner.waitUntilDone();\r
 }\r
 \r
 function obl(e) {\r
@@ -24,10 +24,10 @@ function obl(e) {
 }\r
 \r
 function finish() {\r
-    if (window.layoutTestController)\r
-        layoutTestController.notifyDone();\r
+    if (window.testRunner)\r
+        testRunner.notifyDone();\r
 }\r
 </script>\r
 <object type="application/x-no-such-mime" onbeforeload="obl();"></embed>\r
 </body>\r
-</html>
\ No newline at end of file
+</html>

diff --git a/LayoutTests/http/tests/cache/history-only-cached-subresource-loads-max-age-https.html b/LayoutTests/http/tests/cache/history-only-cached-subresource-loads-max-age-https.html
index e90d830aa3394547653d549aea4dbe9ed481174b..d72382bbfe65e495de5323a42180e09d42507d1a 100644 (file)
--- a/LayoutTests/http/tests/cache/history-only-cached-subresource-loads-max-age-https.html
+++ b/LayoutTests/http/tests/cache/history-only-cached-subresource-loads-max-age-https.html
@@ -15,10 +15,10 @@
     <pre id="console"></pre>
     <script>
     // Asynchronous test because this requires a new window to perform multiple navigations.
-    if (window.layoutTestController) {
-        window.layoutTestController.dumpAsText();
-        window.layoutTestController.waitUntilDone();
-        window.layoutTestController.setCanOpenWindows();
+    if (window.testRunner) {
+        window.testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
+        window.testRunner.setCanOpenWindows();
     }
 
     // Values to check.
@@ -77,8 +77,8 @@
 
         // Test completed.
         target.close();
-        if (window.layoutTestController)
-            window.layoutTestController.notifyDone();
+        if (window.testRunner)
+            window.testRunner.notifyDone();
 
     }, false);
 

diff --git a/LayoutTests/http/tests/cache/history-only-cached-subresource-loads.html b/LayoutTests/http/tests/cache/history-only-cached-subresource-loads.html
index 1ad03c0d8b819919df14f7edb5f99c8502dc4afe..2a09b3b0acb9615fdd480e1751457f816e100d97 100644 (file)
--- a/LayoutTests/http/tests/cache/history-only-cached-subresource-loads.html
+++ b/LayoutTests/http/tests/cache/history-only-cached-subresource-loads.html
@@ -15,10 +15,10 @@
     <pre id="console"></pre>
     <script>
     // Asynchronous test because this requires a new window to perform multiple navigations.
-    if (window.layoutTestController) {
-        window.layoutTestController.dumpAsText();
-        window.layoutTestController.waitUntilDone();
-        window.layoutTestController.setCanOpenWindows();
+    if (window.testRunner) {
+        window.testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
+        window.testRunner.setCanOpenWindows();
     }
 
     // Values to check.
@@ -77,8 +77,8 @@
 
         // Test completed.
         target.close();
-        if (window.layoutTestController)
-            window.layoutTestController.notifyDone();
+        if (window.testRunner)
+            window.testRunner.notifyDone();
 
     }, false);
 

diff --git a/LayoutTests/http/tests/cache/loaded-from-cache-after-reload-within-iframe.html b/LayoutTests/http/tests/cache/loaded-from-cache-after-reload-within-iframe.html
index 8605a6b1f2f074558186bb00a4fb80a61844f059..e5bbcfc3193f45f3cea8f96539344624cd0af166 100644 (file)
--- a/LayoutTests/http/tests/cache/loaded-from-cache-after-reload-within-iframe.html
+++ b/LayoutTests/http/tests/cache/loaded-from-cache-after-reload-within-iframe.html
@@ -5,9 +5,9 @@
 // loaded from the cache.
 
 if (!sessionStorage.lastRandom) {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 }
 
@@ -17,8 +17,8 @@ function done(result)
 
     document.body.innerText = result;
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function iframeLoaded()

diff --git a/LayoutTests/http/tests/cache/loaded-from-cache-after-reload.html b/LayoutTests/http/tests/cache/loaded-from-cache-after-reload.html
index 0f13d5a157e98a43d2903de737aa6348eff8859a..047dd1fdffcaa1dcb2a87cb5663c759ce3abb442 100644 (file)
--- a/LayoutTests/http/tests/cache/loaded-from-cache-after-reload.html
+++ b/LayoutTests/http/tests/cache/loaded-from-cache-after-reload.html
@@ -5,9 +5,9 @@
 // loaded from the cache.
 
 if (!sessionStorage.lastRandom) {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 }
 
@@ -17,8 +17,8 @@ function done(result)
 
     document.body.innerText = result;
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function scriptLoaded()

diff --git a/LayoutTests/http/tests/cache/post-redirect-get.php b/LayoutTests/http/tests/cache/post-redirect-get.php
index b5e8878c3b98830e4d5c5c2e327331a9a8d15c0a..ce04ca2f108e777000900bc71591bbf0baea4b8b 100644 (file)
--- a/LayoutTests/http/tests/cache/post-redirect-get.php
+++ b/LayoutTests/http/tests/cache/post-redirect-get.php
@@ -21,9 +21,9 @@ if ($_POST["submit"] == "redirect") {
 <body>
 <div id="result"></div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
     
 function logAndFinish(message)
@@ -32,8 +32,8 @@ function logAndFinish(message)
     var xhr = new XMLHttpRequest;
     xhr.open("GET", "../resources/reset-temp-file.php?filename=post.tmp", false);
     xhr.send(null);
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner