summaryrefslogtreecommitdiffstats
path: root/webkit/data/test_shell
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 19:04:17 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 19:04:17 +0000
commite93bad16908a23ddea11fa6b2a9071b2369eca01 (patch)
tree57726494dd1d8109737f6308958dc2614eac0f34 /webkit/data/test_shell
parentba7895d07bcddbf01ec9528535e02355d4709296 (diff)
downloadchromium_src-e93bad16908a23ddea11fa6b2a9071b2369eca01.zip
chromium_src-e93bad16908a23ddea11fa6b2a9071b2369eca01.tar.gz
chromium_src-e93bad16908a23ddea11fa6b2a9071b2369eca01.tar.bz2
Remove layoutTestController from test_shell.
webkit/glue/iframe_redirect_unittest.cc was moved to webkit_unit_tests in WebKit r120391, so we can delete it. Nothing else depends on layoutTestController, so we can remove it. There's still a bunch of layout testing code in test_shell. I'll remove those in follow up changes. BUG=132672 TEST=Covered by test_shell_tests. Review URL: https://chromiumcodereview.appspot.com/10536207 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data/test_shell')
-rw-r--r--webkit/data/test_shell/iframe_redirect/child.html8
-rw-r--r--webkit/data/test_shell/iframe_redirect/main.html12
2 files changed, 0 insertions, 20 deletions
diff --git a/webkit/data/test_shell/iframe_redirect/child.html b/webkit/data/test_shell/iframe_redirect/child.html
deleted file mode 100644
index 2f395bc..0000000
--- a/webkit/data/test_shell/iframe_redirect/child.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
- <body>
- <script>
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- </script>
- </body>
-</html>
diff --git a/webkit/data/test_shell/iframe_redirect/main.html b/webkit/data/test_shell/iframe_redirect/main.html
deleted file mode 100644
index 9966264..0000000
--- a/webkit/data/test_shell/iframe_redirect/main.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
- <body>
- <iframe id='ifr'>
- </iframe>
- <script>
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
- var ifr = document.getElementById('ifr');
- ifr.contentWindow.document.location = "child.html";
- </script>
- </body>
-</html>