Remove chrome/http/mime tests. They've been failing for literally years, and

no one is actually sure what they were even supposed to do.

  BUG=24192
  R=dglazkov@chromium.org
  TEST=chrome/http/mime

Review URL: http://codereview.chromium.org/399109

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32485 0039d316-1c4b-4281-b951-d872f2087c98

246 files changed, 0 insertions, 4041 deletions

diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_NULL-expected.txt b/webkit/data/layout_tests/chrome/http/mime/iframe_NULL-expected.txt
deleted file mode 100644
index 36bfd1f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_NULL-expected.txt
+++ /dev/null
@@ -1,240 +0,0 @@
-layer at (0,0) size 785x5152
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x5152
-  RenderBlock {HTML} at (0,0) size 785x5152
-    RenderBody {BODY} at (8,8) size 769x5136
-      RenderText {#text} at (0,0) size 754x36
-        text run at (0,0) width 754: "This HTML is used to test HTTP content-type \"NULL\" by having multiple iframes render different types of content for"
-        text run at (0,18) width 236: "the same HTTP content-type header. "
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (0,36) size 162x18
-        text run at (0,36) width 162: "Well here are the frames !"
-      RenderBR {BR} at (162,50) size 0x0
-      RenderBR {BR} at (0,54) size 0x18
-      RenderBR {BR} at (0,72) size 0x18
-      RenderText {#text} at (0,90) size 687x18
-        text run at (0,90) width 687: "This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (687,104) size 0x0
-      RenderText {#text} at (0,108) size 344x18
-        text run at (0,108) width 344: "Expected : This iframe should have an HTML as text ."
-      RenderBR {BR} at (344,122) size 0x0
-      RenderPartObject {IFRAME} at (0,126) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,416) size 4x18
-        text run at (504,416) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,434) size 0x18
-      RenderText {#text} at (0,452) size 695x18
-        text run at (0,452) width 695: "This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (695,466) size 0x0
-      RenderText {#text} at (0,470) size 344x18
-        text run at (0,470) width 344: "Expected : This iframe should have an HTML as text ."
-      RenderBR {BR} at (344,484) size 0x0
-      RenderPartObject {IFRAME} at (0,488) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,778) size 4x18
-        text run at (504,778) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,796) size 0x18
-      RenderText {#text} at (0,814) size 685x18
-        text run at (0,814) width 685: "This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (685,828) size 0x0
-      RenderText {#text} at (0,832) size 344x18
-        text run at (0,832) width 344: "Expected : This iframe should have an HTML as text ."
-      RenderBR {BR} at (344,846) size 0x0
-      RenderPartObject {IFRAME} at (0,850) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1140) size 4x18
-        text run at (504,1140) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1158) size 0x18
-      RenderText {#text} at (0,1176) size 694x18
-        text run at (0,1176) width 694: "This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (694,1190) size 0x0
-      RenderText {#text} at (0,1194) size 344x18
-        text run at (0,1194) width 344: "Expected : This iframe should have an HTML as text ."
-      RenderBR {BR} at (344,1208) size 0x0
-      RenderPartObject {IFRAME} at (0,1212) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1502) size 4x18
-        text run at (504,1502) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1520) size 0x18
-      RenderText {#text} at (0,1538) size 698x18
-        text run at (0,1538) width 698: "This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (698,1552) size 0x0
-      RenderText {#text} at (0,1556) size 344x18
-        text run at (0,1556) width 344: "Expected : This iframe should have an HTML as text ."
-      RenderBR {BR} at (344,1570) size 0x0
-      RenderPartObject {IFRAME} at (0,1574) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1864) size 4x18
-        text run at (504,1864) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1882) size 0x18
-      RenderText {#text} at (0,1900) size 572x18
-        text run at (0,1900) width 572: "This frame tests loading of a HTML page when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (572,1914) size 0x0
-      RenderText {#text} at (0,1918) size 344x18
-        text run at (0,1918) width 344: "Expected : This iframe should have an HTML as text ."
-      RenderBR {BR} at (344,1932) size 0x0
-      RenderPartObject {IFRAME} at (0,1936) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2226) size 4x18
-        text run at (504,2226) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2244) size 0x18
-      RenderText {#text} at (0,2262) size 732x18
-        text run at (0,2262) width 732: "This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (732,2276) size 0x0
-      RenderText {#text} at (0,2280) size 344x18
-        text run at (0,2280) width 344: "Expected : This iframe should have an HTML as text ."
-      RenderBR {BR} at (344,2294) size 0x0
-      RenderPartObject {IFRAME} at (0,2298) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2588) size 4x18
-        text run at (504,2588) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2606) size 0x18
-      RenderText {#text} at (0,2624) size 657x18
-        text run at (0,2624) width 657: "This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (657,2638) size 0x0
-      RenderText {#text} at (0,2642) size 310x18
-        text run at (0,2642) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2656) size 0x0
-      RenderPartObject {IFRAME} at (0,2660) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2950) size 4x18
-        text run at (504,2950) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2968) size 0x18
-      RenderText {#text} at (0,2986) size 665x18
-        text run at (0,2986) width 665: "This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (665,3000) size 0x0
-      RenderText {#text} at (0,3004) size 310x18
-        text run at (0,3004) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3018) size 0x0
-      RenderPartObject {IFRAME} at (0,3022) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3312) size 4x18
-        text run at (504,3312) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3330) size 0x18
-      RenderText {#text} at (0,3348) size 655x18
-        text run at (0,3348) width 655: "This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (655,3362) size 0x0
-      RenderText {#text} at (0,3366) size 307x18
-        text run at (0,3366) width 307: "Expected : This iframe should have an IMAGE ."
-      RenderBR {BR} at (307,3380) size 0x0
-      RenderPartObject {IFRAME} at (0,3384) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3674) size 4x18
-        text run at (504,3674) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3692) size 0x18
-      RenderText {#text} at (0,3710) size 664x18
-        text run at (0,3710) width 664: "This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (664,3724) size 0x0
-      RenderText {#text} at (0,3728) size 310x18
-        text run at (0,3728) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3742) size 0x0
-      RenderPartObject {IFRAME} at (0,3746) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4036) size 4x18
-        text run at (504,4036) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4054) size 0x18
-      RenderText {#text} at (0,4072) size 668x18
-        text run at (0,4072) width 668: "This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (668,4086) size 0x0
-      RenderText {#text} at (0,4090) size 310x18
-        text run at (0,4090) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4104) size 0x0
-      RenderPartObject {IFRAME} at (0,4108) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4398) size 4x18
-        text run at (504,4398) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4416) size 0x18
-      RenderText {#text} at (0,4434) size 676x18
-        text run at (0,4434) width 676: "This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (676,4448) size 0x0
-      RenderText {#text} at (0,4452) size 322x18
-        text run at (0,4452) width 322: "Expected : This iframe should have simple TEXT ."
-      RenderBR {BR} at (322,4466) size 0x0
-      RenderPartObject {IFRAME} at (0,4470) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4760) size 4x18
-        text run at (504,4760) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4778) size 0x18
-      RenderText {#text} at (0,4796) size 683x18
-        text run at (0,4796) width 683: "This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to \"NULL\" ."
-      RenderBR {BR} at (683,4810) size 0x0
-      RenderText {#text} at (0,4814) size 322x18
-        text run at (0,4814) width 322: "Expected : This iframe should have simple TEXT ."
-      RenderBR {BR} at (322,4828) size 0x0
-      RenderPartObject {IFRAME} at (0,4832) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_NULL.html b/webkit/data/layout_tests/chrome/http/mime/iframe_NULL.html
deleted file mode 100644
index cfc8d7c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_NULL.html
+++ /dev/null
@@ -1,56 +0,0 @@
-This HTML is used to test HTTP content-type "NULL" by having multiple iframes render different types of content for the same HTTP content-type header.
-<script>
-  if(window.layoutTestController)
-    window.layoutTestController.waitUntilDone();
-</script>
-<html>
-<body>
-<br>Well here are the frames !<br>
-<br><br>This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have an HTML as text .<br>
-<iframe src="resources/getpage.pl?type=NULL&tag=img&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have an HTML as text .<br>
-<iframe src="resources/getpage.pl?type=NULL&tag=img&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have an HTML as text .<br>
-<iframe src="resources/getpage.pl?type=NULL&tag=img&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have an HTML as text .<br>
-<iframe src="resources/getpage.pl?type=NULL&tag=img&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have an HTML as text .<br>
-<iframe src="resources/getpage.pl?type=NULL&tag=img&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have an HTML as text .<br>
-<iframe src="resources/getpage.pl?type=NULL&tag=img&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have an HTML as text .<br>
-<iframe src="resources/getpage.pl?type=NULL&tag=embed&content=type_swf.swf" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=NULL&switch=nohtml&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=NULL&switch=nohtml&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have an IMAGE .<br>
-<iframe src="resources/getpage.pl?type=NULL&switch=nohtml&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=NULL&switch=nohtml&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=NULL&switch=nohtml&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have simple TEXT .<br>
-<iframe src="resources/getpage.pl?type=NULL&switch=nohtml&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to "NULL" .<br> Expected : This iframe should have simple TEXT .<br>
-<iframe src="resources/getpage.pl?type=NULL&switch=nohtml&content=type_swf.swf" height="300" width="500"></iframe>
-
-</body>
-</html>
-<script>
-  if(window.layoutTestController)
-    layoutTestController.notifyDone();
-</script>
\ No newline at end of file
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_application_x-shockwave-flash-expected.txt b/webkit/data/layout_tests/chrome/http/mime/iframe_application_x-shockwave-flash-expected.txt
deleted file mode 100644
index 6e3f5f3..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_application_x-shockwave-flash-expected.txt
+++ /dev/null
@@ -1,253 +0,0 @@
-layer at (0,0) size 785x5386
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x5386
-  RenderBlock {HTML} at (0,0) size 785x5386
-    RenderBody {BODY} at (8,8) size 769x5370
-      RenderText {#text} at (0,0) size 719x36
-        text run at (0,0) width 719: "This HTML is used to test HTTP content-type \"application/x-shockwave-flash\" by having multiple iframes render"
-        text run at (0,18) width 419: "different types of content for the same HTTP content-type header. "
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (0,36) size 162x18
-        text run at (0,36) width 162: "Well here are the frames !"
-      RenderBR {BR} at (162,50) size 0x0
-      RenderBR {BR} at (0,54) size 0x18
-      RenderBR {BR} at (0,72) size 0x18
-      RenderText {#text} at (0,90) size 714x36
-        text run at (0,90) width 714: "This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"application/x-"
-        text run at (0,108) width 121: "shockwave-flash\" ."
-      RenderBR {BR} at (121,122) size 0x0
-      RenderText {#text} at (0,126) size 310x18
-        text run at (0,126) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,140) size 0x0
-      RenderPartObject {IFRAME} at (0,144) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,434) size 4x18
-        text run at (504,434) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,452) size 0x18
-      RenderText {#text} at (0,470) size 722x36
-        text run at (0,470) width 722: "This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"application/x-"
-        text run at (0,488) width 121: "shockwave-flash\" ."
-      RenderBR {BR} at (121,502) size 0x0
-      RenderText {#text} at (0,506) size 310x18
-        text run at (0,506) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,520) size 0x0
-      RenderPartObject {IFRAME} at (0,524) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,814) size 4x18
-        text run at (504,814) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,832) size 0x18
-      RenderText {#text} at (0,850) size 712x36
-        text run at (0,850) width 712: "This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"application/x-"
-        text run at (0,868) width 121: "shockwave-flash\" ."
-      RenderBR {BR} at (121,882) size 0x0
-      RenderText {#text} at (0,886) size 310x18
-        text run at (0,886) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,900) size 0x0
-      RenderPartObject {IFRAME} at (0,904) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1194) size 4x18
-        text run at (504,1194) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1212) size 0x18
-      RenderText {#text} at (0,1230) size 721x36
-        text run at (0,1230) width 721: "This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"application/x-"
-        text run at (0,1248) width 121: "shockwave-flash\" ."
-      RenderBR {BR} at (121,1262) size 0x0
-      RenderText {#text} at (0,1266) size 310x18
-        text run at (0,1266) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1280) size 0x0
-      RenderPartObject {IFRAME} at (0,1284) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1574) size 4x18
-        text run at (504,1574) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1592) size 0x18
-      RenderText {#text} at (0,1610) size 725x36
-        text run at (0,1610) width 725: "This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"application/x-"
-        text run at (0,1628) width 121: "shockwave-flash\" ."
-      RenderBR {BR} at (121,1642) size 0x0
-      RenderText {#text} at (0,1646) size 310x18
-        text run at (0,1646) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1660) size 0x0
-      RenderPartObject {IFRAME} at (0,1664) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1954) size 4x18
-        text run at (504,1954) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1972) size 0x18
-      RenderText {#text} at (0,1990) size 720x18
-        text run at (0,1990) width 720: "This frame tests loading of a HTML page when the HTTP content-type is set to \"application/x-shockwave-flash\" ."
-      RenderBR {BR} at (720,2004) size 0x0
-      RenderText {#text} at (0,2008) size 310x18
-        text run at (0,2008) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2022) size 0x0
-      RenderPartObject {IFRAME} at (0,2026) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2316) size 4x18
-        text run at (504,2316) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2334) size 0x18
-      RenderText {#text} at (0,2352) size 759x36
-        text run at (0,2352) width 759: "This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"application/x-"
-        text run at (0,2370) width 121: "shockwave-flash\" ."
-      RenderBR {BR} at (121,2384) size 0x0
-      RenderText {#text} at (0,2388) size 310x18
-        text run at (0,2388) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2402) size 0x0
-      RenderPartObject {IFRAME} at (0,2406) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2696) size 4x18
-        text run at (504,2696) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2714) size 0x18
-      RenderText {#text} at (0,2732) size 760x36
-        text run at (0,2732) width 760: "This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to \"application/x-shockwave-"
-        text run at (0,2750) width 45: "flash\" ."
-      RenderBR {BR} at (45,2764) size 0x0
-      RenderText {#text} at (0,2768) size 340x18
-        text run at (0,2768) width 340: "Expected : This iframe should have a FLASH object ."
-      RenderBR {BR} at (340,2782) size 0x0
-      RenderPartObject {IFRAME} at (0,2786) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3076) size 4x18
-        text run at (504,3076) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3094) size 0x18
-      RenderText {#text} at (0,3112) size 768x36
-        text run at (0,3112) width 768: "This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to \"application/x-shockwave-"
-        text run at (0,3130) width 45: "flash\" ."
-      RenderBR {BR} at (45,3144) size 0x0
-      RenderText {#text} at (0,3148) size 310x18
-        text run at (0,3148) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3162) size 0x0
-      RenderPartObject {IFRAME} at (0,3166) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3456) size 4x18
-        text run at (504,3456) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3474) size 0x18
-      RenderText {#text} at (0,3492) size 758x36
-        text run at (0,3492) width 758: "This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to \"application/x-shockwave-"
-        text run at (0,3510) width 45: "flash\" ."
-      RenderBR {BR} at (45,3524) size 0x0
-      RenderText {#text} at (0,3528) size 310x18
-        text run at (0,3528) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3542) size 0x0
-      RenderPartObject {IFRAME} at (0,3546) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3836) size 4x18
-        text run at (504,3836) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3854) size 0x18
-      RenderText {#text} at (0,3872) size 767x36
-        text run at (0,3872) width 767: "This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to \"application/x-shockwave-"
-        text run at (0,3890) width 45: "flash\" ."
-      RenderBR {BR} at (45,3904) size 0x0
-      RenderText {#text} at (0,3908) size 340x18
-        text run at (0,3908) width 340: "Expected : This iframe should have a FLASH object ."
-      RenderBR {BR} at (340,3922) size 0x0
-      RenderPartObject {IFRAME} at (0,3926) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4216) size 4x18
-        text run at (504,4216) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4234) size 0x18
-      RenderText {#text} at (0,4252) size 695x36
-        text run at (0,4252) width 695: "This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"application/x-"
-        text run at (0,4270) width 121: "shockwave-flash\" ."
-      RenderBR {BR} at (121,4284) size 0x0
-      RenderText {#text} at (0,4288) size 340x18
-        text run at (0,4288) width 340: "Expected : This iframe should have a FLASH object ."
-      RenderBR {BR} at (340,4302) size 0x0
-      RenderPartObject {IFRAME} at (0,4306) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4596) size 4x18
-        text run at (504,4596) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4614) size 0x18
-      RenderText {#text} at (0,4632) size 703x36
-        text run at (0,4632) width 703: "This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"application/x-"
-        text run at (0,4650) width 121: "shockwave-flash\" ."
-      RenderBR {BR} at (121,4664) size 0x0
-      RenderText {#text} at (0,4668) size 310x18
-        text run at (0,4668) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4682) size 0x0
-      RenderPartObject {IFRAME} at (0,4686) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4976) size 4x18
-        text run at (504,4976) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4994) size 0x18
-      RenderText {#text} at (0,5012) size 710x36
-        text run at (0,5012) width 710: "This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to \"application/x-"
-        text run at (0,5030) width 121: "shockwave-flash\" ."
-      RenderBR {BR} at (121,5044) size 0x0
-      RenderText {#text} at (0,5048) size 340x18
-        text run at (0,5048) width 340: "Expected : This iframe should have a FLASH object ."
-      RenderBR {BR} at (340,5062) size 0x0
-      RenderPartObject {IFRAME} at (0,5066) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_application_x-shockwave-flash.html b/webkit/data/layout_tests/chrome/http/mime/iframe_application_x-shockwave-flash.html
deleted file mode 100644
index 1cc5e77..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_application_x-shockwave-flash.html
+++ /dev/null
@@ -1,56 +0,0 @@
-This HTML is used to test HTTP content-type "application/x-shockwave-flash" by having multiple iframes render different types of content for the same HTTP content-type header.
-<script>
-  if(window.layoutTestController)
-    window.layoutTestController.waitUntilDone();
-</script>
-<html>
-<body>
-<br>Well here are the frames !<br>
-<br><br>This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&tag=embed&content=type_swf.swf" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have a FLASH object .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have a FLASH object .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have a FLASH object .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .<br> Expected : This iframe should have a FLASH object .<br>
-<iframe src="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_swf.swf" height="300" width="500"></iframe>
-
-</body>
-</html>
-<script>
-  if(window.layoutTestController)
-    layoutTestController.notifyDone();
-</script>
\ No newline at end of file
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_image_bmp-expected.txt b/webkit/data/layout_tests/chrome/http/mime/iframe_image_bmp-expected.txt
deleted file mode 100644
index 7e6f66c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_image_bmp-expected.txt
+++ /dev/null
@@ -1,240 +0,0 @@
-layer at (0,0) size 785x5152
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x5152
-  RenderBlock {HTML} at (0,0) size 785x5152
-    RenderBody {BODY} at (8,8) size 769x5136
-      RenderText {#text} at (0,0) size 758x36
-        text run at (0,0) width 758: "This HTML is used to test HTTP content-type \"image/bmp\" by having multiple iframes render different types of content"
-        text run at (0,18) width 258: "for the same HTTP content-type header. "
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (0,36) size 162x18
-        text run at (0,36) width 162: "Well here are the frames !"
-      RenderBR {BR} at (162,50) size 0x0
-      RenderBR {BR} at (0,54) size 0x18
-      RenderBR {BR} at (0,72) size 0x18
-      RenderText {#text} at (0,90) size 713x18
-        text run at (0,90) width 713: "This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (713,104) size 0x0
-      RenderText {#text} at (0,108) size 310x18
-        text run at (0,108) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,122) size 0x0
-      RenderPartObject {IFRAME} at (0,126) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,416) size 4x18
-        text run at (504,416) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,434) size 0x18
-      RenderText {#text} at (0,452) size 721x18
-        text run at (0,452) width 721: "This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (721,466) size 0x0
-      RenderText {#text} at (0,470) size 310x18
-        text run at (0,470) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,484) size 0x0
-      RenderPartObject {IFRAME} at (0,488) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,778) size 4x18
-        text run at (504,778) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,796) size 0x18
-      RenderText {#text} at (0,814) size 711x18
-        text run at (0,814) width 711: "This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (711,828) size 0x0
-      RenderText {#text} at (0,832) size 310x18
-        text run at (0,832) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,846) size 0x0
-      RenderPartObject {IFRAME} at (0,850) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1140) size 4x18
-        text run at (504,1140) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1158) size 0x18
-      RenderText {#text} at (0,1176) size 720x18
-        text run at (0,1176) width 720: "This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (720,1190) size 0x0
-      RenderText {#text} at (0,1194) size 310x18
-        text run at (0,1194) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1208) size 0x0
-      RenderPartObject {IFRAME} at (0,1212) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1502) size 4x18
-        text run at (504,1502) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1520) size 0x18
-      RenderText {#text} at (0,1538) size 724x18
-        text run at (0,1538) width 724: "This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (724,1552) size 0x0
-      RenderText {#text} at (0,1556) size 310x18
-        text run at (0,1556) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1570) size 0x0
-      RenderPartObject {IFRAME} at (0,1574) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1864) size 4x18
-        text run at (504,1864) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1882) size 0x18
-      RenderText {#text} at (0,1900) size 598x18
-        text run at (0,1900) width 598: "This frame tests loading of a HTML page when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (598,1914) size 0x0
-      RenderText {#text} at (0,1918) size 310x18
-        text run at (0,1918) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1932) size 0x0
-      RenderPartObject {IFRAME} at (0,1936) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2226) size 4x18
-        text run at (504,2226) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2244) size 0x18
-      RenderText {#text} at (0,2262) size 758x18
-        text run at (0,2262) width 758: "This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (758,2276) size 0x0
-      RenderText {#text} at (0,2280) size 310x18
-        text run at (0,2280) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2294) size 0x0
-      RenderPartObject {IFRAME} at (0,2298) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2588) size 4x18
-        text run at (504,2588) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2606) size 0x18
-      RenderText {#text} at (0,2624) size 683x18
-        text run at (0,2624) width 683: "This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (683,2638) size 0x0
-      RenderText {#text} at (0,2642) size 310x18
-        text run at (0,2642) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2656) size 0x0
-      RenderPartObject {IFRAME} at (0,2660) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2950) size 4x18
-        text run at (504,2950) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2968) size 0x18
-      RenderText {#text} at (0,2986) size 691x18
-        text run at (0,2986) width 691: "This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (691,3000) size 0x0
-      RenderText {#text} at (0,3004) size 310x18
-        text run at (0,3004) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3018) size 0x0
-      RenderPartObject {IFRAME} at (0,3022) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3312) size 4x18
-        text run at (504,3312) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3330) size 0x18
-      RenderText {#text} at (0,3348) size 681x18
-        text run at (0,3348) width 681: "This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (681,3362) size 0x0
-      RenderText {#text} at (0,3366) size 310x18
-        text run at (0,3366) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3380) size 0x0
-      RenderPartObject {IFRAME} at (0,3384) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3674) size 4x18
-        text run at (504,3674) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3692) size 0x18
-      RenderText {#text} at (0,3710) size 690x18
-        text run at (0,3710) width 690: "This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (690,3724) size 0x0
-      RenderText {#text} at (0,3728) size 310x18
-        text run at (0,3728) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3742) size 0x0
-      RenderPartObject {IFRAME} at (0,3746) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4036) size 4x18
-        text run at (504,4036) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4054) size 0x18
-      RenderText {#text} at (0,4072) size 694x18
-        text run at (0,4072) width 694: "This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (694,4086) size 0x0
-      RenderText {#text} at (0,4090) size 310x18
-        text run at (0,4090) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4104) size 0x0
-      RenderPartObject {IFRAME} at (0,4108) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4398) size 4x18
-        text run at (504,4398) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4416) size 0x18
-      RenderText {#text} at (0,4434) size 702x18
-        text run at (0,4434) width 702: "This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (702,4448) size 0x0
-      RenderText {#text} at (0,4452) size 310x18
-        text run at (0,4452) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4466) size 0x0
-      RenderPartObject {IFRAME} at (0,4470) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4760) size 4x18
-        text run at (504,4760) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4778) size 0x18
-      RenderText {#text} at (0,4796) size 709x18
-        text run at (0,4796) width 709: "This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to \"image/bmp\" ."
-      RenderBR {BR} at (709,4810) size 0x0
-      RenderText {#text} at (0,4814) size 310x18
-        text run at (0,4814) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4828) size 0x0
-      RenderPartObject {IFRAME} at (0,4832) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_image_bmp.html b/webkit/data/layout_tests/chrome/http/mime/iframe_image_bmp.html
deleted file mode 100644
index 035bac3..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_image_bmp.html
+++ /dev/null
@@ -1,56 +0,0 @@
-This HTML is used to test HTTP content-type "image/bmp" by having multiple iframes render different types of content for the same HTTP content-type header.
-<script>
-  if(window.layoutTestController)
-    window.layoutTestController.waitUntilDone();
-</script>
-<html>
-<body>
-<br>Well here are the frames !<br>
-<br><br>This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&tag=img&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&tag=img&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&tag=img&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&tag=img&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&tag=img&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&tag=img&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&tag=embed&content=type_swf.swf" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to "image/bmp" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_swf.swf" height="300" width="500"></iframe>
-
-</body>
-</html>
-<script>
-  if(window.layoutTestController)
-    layoutTestController.notifyDone();
-</script>
\ No newline at end of file
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_image_gif-expected.txt b/webkit/data/layout_tests/chrome/http/mime/iframe_image_gif-expected.txt
deleted file mode 100644
index 686f8ba..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_image_gif-expected.txt
+++ /dev/null
@@ -1,240 +0,0 @@
-layer at (0,0) size 785x5152
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x5152
-  RenderBlock {HTML} at (0,0) size 785x5152
-    RenderBody {BODY} at (8,8) size 769x5136
-      RenderText {#text} at (0,0) size 769x36
-        text run at (0,0) width 769: "This HTML is used to test HTTP content-type \"image/gif\" by having multiple iframes render different types of content for"
-        text run at (0,18) width 236: "the same HTTP content-type header. "
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (0,36) size 162x18
-        text run at (0,36) width 162: "Well here are the frames !"
-      RenderBR {BR} at (162,50) size 0x0
-      RenderBR {BR} at (0,54) size 0x18
-      RenderBR {BR} at (0,72) size 0x18
-      RenderText {#text} at (0,90) size 702x18
-        text run at (0,90) width 702: "This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (702,104) size 0x0
-      RenderText {#text} at (0,108) size 310x18
-        text run at (0,108) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,122) size 0x0
-      RenderPartObject {IFRAME} at (0,126) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,416) size 4x18
-        text run at (504,416) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,434) size 0x18
-      RenderText {#text} at (0,452) size 710x18
-        text run at (0,452) width 710: "This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (710,466) size 0x0
-      RenderText {#text} at (0,470) size 310x18
-        text run at (0,470) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,484) size 0x0
-      RenderPartObject {IFRAME} at (0,488) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,778) size 4x18
-        text run at (504,778) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,796) size 0x18
-      RenderText {#text} at (0,814) size 700x18
-        text run at (0,814) width 700: "This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (700,828) size 0x0
-      RenderText {#text} at (0,832) size 310x18
-        text run at (0,832) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,846) size 0x0
-      RenderPartObject {IFRAME} at (0,850) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1140) size 4x18
-        text run at (504,1140) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1158) size 0x18
-      RenderText {#text} at (0,1176) size 709x18
-        text run at (0,1176) width 709: "This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (709,1190) size 0x0
-      RenderText {#text} at (0,1194) size 310x18
-        text run at (0,1194) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1208) size 0x0
-      RenderPartObject {IFRAME} at (0,1212) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1502) size 4x18
-        text run at (504,1502) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1520) size 0x18
-      RenderText {#text} at (0,1538) size 713x18
-        text run at (0,1538) width 713: "This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (713,1552) size 0x0
-      RenderText {#text} at (0,1556) size 310x18
-        text run at (0,1556) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1570) size 0x0
-      RenderPartObject {IFRAME} at (0,1574) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1864) size 4x18
-        text run at (504,1864) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1882) size 0x18
-      RenderText {#text} at (0,1900) size 587x18
-        text run at (0,1900) width 587: "This frame tests loading of a HTML page when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (587,1914) size 0x0
-      RenderText {#text} at (0,1918) size 310x18
-        text run at (0,1918) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1932) size 0x0
-      RenderPartObject {IFRAME} at (0,1936) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2226) size 4x18
-        text run at (504,2226) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2244) size 0x18
-      RenderText {#text} at (0,2262) size 747x18
-        text run at (0,2262) width 747: "This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (747,2276) size 0x0
-      RenderText {#text} at (0,2280) size 310x18
-        text run at (0,2280) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2294) size 0x0
-      RenderPartObject {IFRAME} at (0,2298) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2588) size 4x18
-        text run at (504,2588) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2606) size 0x18
-      RenderText {#text} at (0,2624) size 672x18
-        text run at (0,2624) width 672: "This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (672,2638) size 0x0
-      RenderText {#text} at (0,2642) size 310x18
-        text run at (0,2642) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2656) size 0x0
-      RenderPartObject {IFRAME} at (0,2660) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2950) size 4x18
-        text run at (504,2950) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2968) size 0x18
-      RenderText {#text} at (0,2986) size 680x18
-        text run at (0,2986) width 680: "This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (680,3000) size 0x0
-      RenderText {#text} at (0,3004) size 310x18
-        text run at (0,3004) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3018) size 0x0
-      RenderPartObject {IFRAME} at (0,3022) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3312) size 4x18
-        text run at (504,3312) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3330) size 0x18
-      RenderText {#text} at (0,3348) size 670x18
-        text run at (0,3348) width 670: "This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (670,3362) size 0x0
-      RenderText {#text} at (0,3366) size 310x18
-        text run at (0,3366) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3380) size 0x0
-      RenderPartObject {IFRAME} at (0,3384) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3674) size 4x18
-        text run at (504,3674) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3692) size 0x18
-      RenderText {#text} at (0,3710) size 679x18
-        text run at (0,3710) width 679: "This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (679,3724) size 0x0
-      RenderText {#text} at (0,3728) size 310x18
-        text run at (0,3728) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3742) size 0x0
-      RenderPartObject {IFRAME} at (0,3746) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4036) size 4x18
-        text run at (504,4036) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4054) size 0x18
-      RenderText {#text} at (0,4072) size 683x18
-        text run at (0,4072) width 683: "This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (683,4086) size 0x0
-      RenderText {#text} at (0,4090) size 310x18
-        text run at (0,4090) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4104) size 0x0
-      RenderPartObject {IFRAME} at (0,4108) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4398) size 4x18
-        text run at (504,4398) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4416) size 0x18
-      RenderText {#text} at (0,4434) size 691x18
-        text run at (0,4434) width 691: "This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (691,4448) size 0x0
-      RenderText {#text} at (0,4452) size 310x18
-        text run at (0,4452) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4466) size 0x0
-      RenderPartObject {IFRAME} at (0,4470) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4760) size 4x18
-        text run at (504,4760) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4778) size 0x18
-      RenderText {#text} at (0,4796) size 698x18
-        text run at (0,4796) width 698: "This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to \"image/gif\" ."
-      RenderBR {BR} at (698,4810) size 0x0
-      RenderText {#text} at (0,4814) size 310x18
-        text run at (0,4814) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4828) size 0x0
-      RenderPartObject {IFRAME} at (0,4832) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_image_gif.html b/webkit/data/layout_tests/chrome/http/mime/iframe_image_gif.html
deleted file mode 100644
index d4c1e56..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_image_gif.html
+++ /dev/null
@@ -1,56 +0,0 @@
-This HTML is used to test HTTP content-type "image/gif" by having multiple iframes render different types of content for the same HTTP content-type header.
-<script>
-  if(window.layoutTestController)
-    window.layoutTestController.waitUntilDone();
-</script>
-<html>
-<body>
-<br>Well here are the frames !<br>
-<br><br>This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&tag=img&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&tag=img&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&tag=img&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&tag=img&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&tag=img&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&tag=img&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&tag=embed&content=type_swf.swf" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to "image/gif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_swf.swf" height="300" width="500"></iframe>
-
-</body>
-</html>
-<script>
-  if(window.layoutTestController)
-    layoutTestController.notifyDone();
-</script>
\ No newline at end of file
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_image_jpg-expected.txt b/webkit/data/layout_tests/chrome/http/mime/iframe_image_jpg-expected.txt
deleted file mode 100644
index cac0cf5..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_image_jpg-expected.txt
+++ /dev/null
@@ -1,240 +0,0 @@
-layer at (0,0) size 785x5152
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x5152
-  RenderBlock {HTML} at (0,0) size 785x5152
-    RenderBody {BODY} at (8,8) size 769x5136
-      RenderText {#text} at (0,0) size 750x36
-        text run at (0,0) width 750: "This HTML is used to test HTTP content-type \"image/jpg\" by having multiple iframes render different types of content"
-        text run at (0,18) width 258: "for the same HTTP content-type header. "
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (0,36) size 162x18
-        text run at (0,36) width 162: "Well here are the frames !"
-      RenderBR {BR} at (162,50) size 0x0
-      RenderBR {BR} at (0,54) size 0x18
-      RenderBR {BR} at (0,72) size 0x18
-      RenderText {#text} at (0,90) size 705x18
-        text run at (0,90) width 705: "This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (705,104) size 0x0
-      RenderText {#text} at (0,108) size 310x18
-        text run at (0,108) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,122) size 0x0
-      RenderPartObject {IFRAME} at (0,126) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,416) size 4x18
-        text run at (504,416) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,434) size 0x18
-      RenderText {#text} at (0,452) size 713x18
-        text run at (0,452) width 713: "This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (713,466) size 0x0
-      RenderText {#text} at (0,470) size 310x18
-        text run at (0,470) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,484) size 0x0
-      RenderPartObject {IFRAME} at (0,488) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,778) size 4x18
-        text run at (504,778) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,796) size 0x18
-      RenderText {#text} at (0,814) size 703x18
-        text run at (0,814) width 703: "This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (703,828) size 0x0
-      RenderText {#text} at (0,832) size 310x18
-        text run at (0,832) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,846) size 0x0
-      RenderPartObject {IFRAME} at (0,850) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1140) size 4x18
-        text run at (504,1140) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1158) size 0x18
-      RenderText {#text} at (0,1176) size 712x18
-        text run at (0,1176) width 712: "This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (712,1190) size 0x0
-      RenderText {#text} at (0,1194) size 310x18
-        text run at (0,1194) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1208) size 0x0
-      RenderPartObject {IFRAME} at (0,1212) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1502) size 4x18
-        text run at (504,1502) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1520) size 0x18
-      RenderText {#text} at (0,1538) size 716x18
-        text run at (0,1538) width 716: "This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (716,1552) size 0x0
-      RenderText {#text} at (0,1556) size 310x18
-        text run at (0,1556) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1570) size 0x0
-      RenderPartObject {IFRAME} at (0,1574) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1864) size 4x18
-        text run at (504,1864) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1882) size 0x18
-      RenderText {#text} at (0,1900) size 590x18
-        text run at (0,1900) width 590: "This frame tests loading of a HTML page when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (590,1914) size 0x0
-      RenderText {#text} at (0,1918) size 310x18
-        text run at (0,1918) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1932) size 0x0
-      RenderPartObject {IFRAME} at (0,1936) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2226) size 4x18
-        text run at (504,2226) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2244) size 0x18
-      RenderText {#text} at (0,2262) size 750x18
-        text run at (0,2262) width 750: "This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (750,2276) size 0x0
-      RenderText {#text} at (0,2280) size 310x18
-        text run at (0,2280) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2294) size 0x0
-      RenderPartObject {IFRAME} at (0,2298) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2588) size 4x18
-        text run at (504,2588) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2606) size 0x18
-      RenderText {#text} at (0,2624) size 675x18
-        text run at (0,2624) width 675: "This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (675,2638) size 0x0
-      RenderText {#text} at (0,2642) size 310x18
-        text run at (0,2642) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2656) size 0x0
-      RenderPartObject {IFRAME} at (0,2660) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2950) size 4x18
-        text run at (504,2950) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2968) size 0x18
-      RenderText {#text} at (0,2986) size 683x18
-        text run at (0,2986) width 683: "This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (683,3000) size 0x0
-      RenderText {#text} at (0,3004) size 310x18
-        text run at (0,3004) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3018) size 0x0
-      RenderPartObject {IFRAME} at (0,3022) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3312) size 4x18
-        text run at (504,3312) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3330) size 0x18
-      RenderText {#text} at (0,3348) size 673x18
-        text run at (0,3348) width 673: "This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (673,3362) size 0x0
-      RenderText {#text} at (0,3366) size 310x18
-        text run at (0,3366) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3380) size 0x0
-      RenderPartObject {IFRAME} at (0,3384) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3674) size 4x18
-        text run at (504,3674) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3692) size 0x18
-      RenderText {#text} at (0,3710) size 682x18
-        text run at (0,3710) width 682: "This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (682,3724) size 0x0
-      RenderText {#text} at (0,3728) size 310x18
-        text run at (0,3728) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3742) size 0x0
-      RenderPartObject {IFRAME} at (0,3746) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4036) size 4x18
-        text run at (504,4036) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4054) size 0x18
-      RenderText {#text} at (0,4072) size 686x18
-        text run at (0,4072) width 686: "This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (686,4086) size 0x0
-      RenderText {#text} at (0,4090) size 310x18
-        text run at (0,4090) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4104) size 0x0
-      RenderPartObject {IFRAME} at (0,4108) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4398) size 4x18
-        text run at (504,4398) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4416) size 0x18
-      RenderText {#text} at (0,4434) size 694x18
-        text run at (0,4434) width 694: "This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (694,4448) size 0x0
-      RenderText {#text} at (0,4452) size 310x18
-        text run at (0,4452) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4466) size 0x0
-      RenderPartObject {IFRAME} at (0,4470) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4760) size 4x18
-        text run at (504,4760) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4778) size 0x18
-      RenderText {#text} at (0,4796) size 701x18
-        text run at (0,4796) width 701: "This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to \"image/jpg\" ."
-      RenderBR {BR} at (701,4810) size 0x0
-      RenderText {#text} at (0,4814) size 310x18
-        text run at (0,4814) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4828) size 0x0
-      RenderPartObject {IFRAME} at (0,4832) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_image_jpg.html b/webkit/data/layout_tests/chrome/http/mime/iframe_image_jpg.html
deleted file mode 100644
index fa7dd8f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_image_jpg.html
+++ /dev/null
@@ -1,56 +0,0 @@
-This HTML is used to test HTTP content-type "image/jpg" by having multiple iframes render different types of content for the same HTTP content-type header.
-<script>
-  if(window.layoutTestController)
-    window.layoutTestController.waitUntilDone();
-</script>
-<html>
-<body>
-<br>Well here are the frames !<br>
-<br><br>This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&tag=img&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&tag=img&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&tag=img&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&tag=img&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&tag=img&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&tag=img&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&tag=embed&content=type_swf.swf" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to "image/jpg" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_swf.swf" height="300" width="500"></iframe>
-
-</body>
-</html>
-<script>
-  if(window.layoutTestController)
-    layoutTestController.notifyDone();
-</script>
\ No newline at end of file
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_image_png-expected.txt b/webkit/data/layout_tests/chrome/http/mime/iframe_image_png-expected.txt
deleted file mode 100644
index 24e7aaa..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_image_png-expected.txt
+++ /dev/null
@@ -1,240 +0,0 @@
-layer at (0,0) size 785x5152
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x5152
-  RenderBlock {HTML} at (0,0) size 785x5152
-    RenderBody {BODY} at (8,8) size 769x5136
-      RenderText {#text} at (0,0) size 754x36
-        text run at (0,0) width 754: "This HTML is used to test HTTP content-type \"image/png\" by having multiple iframes render different types of content"
-        text run at (0,18) width 258: "for the same HTTP content-type header. "
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (0,36) size 162x18
-        text run at (0,36) width 162: "Well here are the frames !"
-      RenderBR {BR} at (162,50) size 0x0
-      RenderBR {BR} at (0,54) size 0x18
-      RenderBR {BR} at (0,72) size 0x18
-      RenderText {#text} at (0,90) size 709x18
-        text run at (0,90) width 709: "This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (709,104) size 0x0
-      RenderText {#text} at (0,108) size 310x18
-        text run at (0,108) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,122) size 0x0
-      RenderPartObject {IFRAME} at (0,126) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,416) size 4x18
-        text run at (504,416) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,434) size 0x18
-      RenderText {#text} at (0,452) size 717x18
-        text run at (0,452) width 717: "This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (717,466) size 0x0
-      RenderText {#text} at (0,470) size 310x18
-        text run at (0,470) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,484) size 0x0
-      RenderPartObject {IFRAME} at (0,488) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,778) size 4x18
-        text run at (504,778) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,796) size 0x18
-      RenderText {#text} at (0,814) size 707x18
-        text run at (0,814) width 707: "This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (707,828) size 0x0
-      RenderText {#text} at (0,832) size 310x18
-        text run at (0,832) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,846) size 0x0
-      RenderPartObject {IFRAME} at (0,850) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1140) size 4x18
-        text run at (504,1140) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1158) size 0x18
-      RenderText {#text} at (0,1176) size 716x18
-        text run at (0,1176) width 716: "This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (716,1190) size 0x0
-      RenderText {#text} at (0,1194) size 310x18
-        text run at (0,1194) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1208) size 0x0
-      RenderPartObject {IFRAME} at (0,1212) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1502) size 4x18
-        text run at (504,1502) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1520) size 0x18
-      RenderText {#text} at (0,1538) size 720x18
-        text run at (0,1538) width 720: "This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (720,1552) size 0x0
-      RenderText {#text} at (0,1556) size 310x18
-        text run at (0,1556) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1570) size 0x0
-      RenderPartObject {IFRAME} at (0,1574) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1864) size 4x18
-        text run at (504,1864) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1882) size 0x18
-      RenderText {#text} at (0,1900) size 594x18
-        text run at (0,1900) width 594: "This frame tests loading of a HTML page when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (594,1914) size 0x0
-      RenderText {#text} at (0,1918) size 310x18
-        text run at (0,1918) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1932) size 0x0
-      RenderPartObject {IFRAME} at (0,1936) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2226) size 4x18
-        text run at (504,2226) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2244) size 0x18
-      RenderText {#text} at (0,2262) size 754x18
-        text run at (0,2262) width 754: "This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (754,2276) size 0x0
-      RenderText {#text} at (0,2280) size 310x18
-        text run at (0,2280) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2294) size 0x0
-      RenderPartObject {IFRAME} at (0,2298) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2588) size 4x18
-        text run at (504,2588) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2606) size 0x18
-      RenderText {#text} at (0,2624) size 679x18
-        text run at (0,2624) width 679: "This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (679,2638) size 0x0
-      RenderText {#text} at (0,2642) size 310x18
-        text run at (0,2642) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2656) size 0x0
-      RenderPartObject {IFRAME} at (0,2660) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2950) size 4x18
-        text run at (504,2950) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2968) size 0x18
-      RenderText {#text} at (0,2986) size 687x18
-        text run at (0,2986) width 687: "This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (687,3000) size 0x0
-      RenderText {#text} at (0,3004) size 310x18
-        text run at (0,3004) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3018) size 0x0
-      RenderPartObject {IFRAME} at (0,3022) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3312) size 4x18
-        text run at (504,3312) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3330) size 0x18
-      RenderText {#text} at (0,3348) size 677x18
-        text run at (0,3348) width 677: "This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (677,3362) size 0x0
-      RenderText {#text} at (0,3366) size 310x18
-        text run at (0,3366) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3380) size 0x0
-      RenderPartObject {IFRAME} at (0,3384) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3674) size 4x18
-        text run at (504,3674) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3692) size 0x18
-      RenderText {#text} at (0,3710) size 686x18
-        text run at (0,3710) width 686: "This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (686,3724) size 0x0
-      RenderText {#text} at (0,3728) size 310x18
-        text run at (0,3728) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3742) size 0x0
-      RenderPartObject {IFRAME} at (0,3746) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4036) size 4x18
-        text run at (504,4036) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4054) size 0x18
-      RenderText {#text} at (0,4072) size 690x18
-        text run at (0,4072) width 690: "This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (690,4086) size 0x0
-      RenderText {#text} at (0,4090) size 310x18
-        text run at (0,4090) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4104) size 0x0
-      RenderPartObject {IFRAME} at (0,4108) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4398) size 4x18
-        text run at (504,4398) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4416) size 0x18
-      RenderText {#text} at (0,4434) size 698x18
-        text run at (0,4434) width 698: "This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (698,4448) size 0x0
-      RenderText {#text} at (0,4452) size 310x18
-        text run at (0,4452) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4466) size 0x0
-      RenderPartObject {IFRAME} at (0,4470) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4760) size 4x18
-        text run at (504,4760) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4778) size 0x18
-      RenderText {#text} at (0,4796) size 705x18
-        text run at (0,4796) width 705: "This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to \"image/png\" ."
-      RenderBR {BR} at (705,4810) size 0x0
-      RenderText {#text} at (0,4814) size 310x18
-        text run at (0,4814) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4828) size 0x0
-      RenderPartObject {IFRAME} at (0,4832) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_image_png.html b/webkit/data/layout_tests/chrome/http/mime/iframe_image_png.html
deleted file mode 100644
index c6313c8..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_image_png.html
+++ /dev/null
@@ -1,56 +0,0 @@
-This HTML is used to test HTTP content-type "image/png" by having multiple iframes render different types of content for the same HTTP content-type header.
-<script>
-  if(window.layoutTestController)
-    window.layoutTestController.waitUntilDone();
-</script>
-<html>
-<body>
-<br>Well here are the frames !<br>
-<br><br>This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&tag=img&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&tag=img&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&tag=img&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&tag=img&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&tag=img&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&tag=img&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&tag=embed&content=type_swf.swf" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&switch=nohtml&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&switch=nohtml&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&switch=nohtml&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&switch=nohtml&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&switch=nohtml&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&switch=nohtml&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to "image/png" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/png&switch=nohtml&content=type_swf.swf" height="300" width="500"></iframe>
-
-</body>
-</html>
-<script>
-  if(window.layoutTestController)
-    layoutTestController.notifyDone();
-</script>
\ No newline at end of file
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_image_tif-expected.txt b/webkit/data/layout_tests/chrome/http/mime/iframe_image_tif-expected.txt
deleted file mode 100644
index a202cac..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_image_tif-expected.txt
+++ /dev/null
@@ -1,240 +0,0 @@
-layer at (0,0) size 785x5152
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x5152
-  RenderBlock {HTML} at (0,0) size 785x5152
-    RenderBody {BODY} at (8,8) size 769x5136
-      RenderText {#text} at (0,0) size 765x36
-        text run at (0,0) width 765: "This HTML is used to test HTTP content-type \"image/tif\" by having multiple iframes render different types of content for"
-        text run at (0,18) width 236: "the same HTTP content-type header. "
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (0,36) size 162x18
-        text run at (0,36) width 162: "Well here are the frames !"
-      RenderBR {BR} at (162,50) size 0x0
-      RenderBR {BR} at (0,54) size 0x18
-      RenderBR {BR} at (0,72) size 0x18
-      RenderText {#text} at (0,90) size 698x18
-        text run at (0,90) width 698: "This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (698,104) size 0x0
-      RenderText {#text} at (0,108) size 310x18
-        text run at (0,108) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,122) size 0x0
-      RenderPartObject {IFRAME} at (0,126) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,416) size 4x18
-        text run at (504,416) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,434) size 0x18
-      RenderText {#text} at (0,452) size 706x18
-        text run at (0,452) width 706: "This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (706,466) size 0x0
-      RenderText {#text} at (0,470) size 310x18
-        text run at (0,470) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,484) size 0x0
-      RenderPartObject {IFRAME} at (0,488) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,778) size 4x18
-        text run at (504,778) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,796) size 0x18
-      RenderText {#text} at (0,814) size 696x18
-        text run at (0,814) width 696: "This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (696,828) size 0x0
-      RenderText {#text} at (0,832) size 310x18
-        text run at (0,832) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,846) size 0x0
-      RenderPartObject {IFRAME} at (0,850) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1140) size 4x18
-        text run at (504,1140) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1158) size 0x18
-      RenderText {#text} at (0,1176) size 705x18
-        text run at (0,1176) width 705: "This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (705,1190) size 0x0
-      RenderText {#text} at (0,1194) size 310x18
-        text run at (0,1194) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1208) size 0x0
-      RenderPartObject {IFRAME} at (0,1212) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1502) size 4x18
-        text run at (504,1502) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1520) size 0x18
-      RenderText {#text} at (0,1538) size 709x18
-        text run at (0,1538) width 709: "This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (709,1552) size 0x0
-      RenderText {#text} at (0,1556) size 310x18
-        text run at (0,1556) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1570) size 0x0
-      RenderPartObject {IFRAME} at (0,1574) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1864) size 4x18
-        text run at (504,1864) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1882) size 0x18
-      RenderText {#text} at (0,1900) size 583x18
-        text run at (0,1900) width 583: "This frame tests loading of a HTML page when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (583,1914) size 0x0
-      RenderText {#text} at (0,1918) size 310x18
-        text run at (0,1918) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,1932) size 0x0
-      RenderPartObject {IFRAME} at (0,1936) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2226) size 4x18
-        text run at (504,2226) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2244) size 0x18
-      RenderText {#text} at (0,2262) size 743x18
-        text run at (0,2262) width 743: "This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (743,2276) size 0x0
-      RenderText {#text} at (0,2280) size 310x18
-        text run at (0,2280) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2294) size 0x0
-      RenderPartObject {IFRAME} at (0,2298) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2588) size 4x18
-        text run at (504,2588) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2606) size 0x18
-      RenderText {#text} at (0,2624) size 668x18
-        text run at (0,2624) width 668: "This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (668,2638) size 0x0
-      RenderText {#text} at (0,2642) size 310x18
-        text run at (0,2642) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,2656) size 0x0
-      RenderPartObject {IFRAME} at (0,2660) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2950) size 4x18
-        text run at (504,2950) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2968) size 0x18
-      RenderText {#text} at (0,2986) size 676x18
-        text run at (0,2986) width 676: "This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (676,3000) size 0x0
-      RenderText {#text} at (0,3004) size 310x18
-        text run at (0,3004) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3018) size 0x0
-      RenderPartObject {IFRAME} at (0,3022) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3312) size 4x18
-        text run at (504,3312) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3330) size 0x18
-      RenderText {#text} at (0,3348) size 666x18
-        text run at (0,3348) width 666: "This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (666,3362) size 0x0
-      RenderText {#text} at (0,3366) size 310x18
-        text run at (0,3366) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3380) size 0x0
-      RenderPartObject {IFRAME} at (0,3384) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3674) size 4x18
-        text run at (504,3674) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3692) size 0x18
-      RenderText {#text} at (0,3710) size 675x18
-        text run at (0,3710) width 675: "This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (675,3724) size 0x0
-      RenderText {#text} at (0,3728) size 310x18
-        text run at (0,3728) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,3742) size 0x0
-      RenderPartObject {IFRAME} at (0,3746) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4036) size 4x18
-        text run at (504,4036) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4054) size 0x18
-      RenderText {#text} at (0,4072) size 679x18
-        text run at (0,4072) width 679: "This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (679,4086) size 0x0
-      RenderText {#text} at (0,4090) size 310x18
-        text run at (0,4090) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4104) size 0x0
-      RenderPartObject {IFRAME} at (0,4108) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4398) size 4x18
-        text run at (504,4398) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4416) size 0x18
-      RenderText {#text} at (0,4434) size 687x18
-        text run at (0,4434) width 687: "This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (687,4448) size 0x0
-      RenderText {#text} at (0,4452) size 310x18
-        text run at (0,4452) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4466) size 0x0
-      RenderPartObject {IFRAME} at (0,4470) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4760) size 4x18
-        text run at (504,4760) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4778) size 0x18
-      RenderText {#text} at (0,4796) size 694x18
-        text run at (0,4796) width 694: "This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to \"image/tif\" ."
-      RenderBR {BR} at (694,4810) size 0x0
-      RenderText {#text} at (0,4814) size 310x18
-        text run at (0,4814) width 310: "Expected : This iframe should have NOTHING ."
-      RenderBR {BR} at (310,4828) size 0x0
-      RenderPartObject {IFRAME} at (0,4832) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_image_tif.html b/webkit/data/layout_tests/chrome/http/mime/iframe_image_tif.html
deleted file mode 100644
index 4b21ca5..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_image_tif.html
+++ /dev/null
@@ -1,56 +0,0 @@
-This HTML is used to test HTTP content-type "image/tif" by having multiple iframes render different types of content for the same HTTP content-type header.
-<script>
-  if(window.layoutTestController)
-    window.layoutTestController.waitUntilDone();
-</script>
-<html>
-<body>
-<br>Well here are the frames !<br>
-<br><br>This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&tag=img&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&tag=img&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&tag=img&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&tag=img&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&tag=img&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&tag=img&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&tag=embed&content=type_swf.swf" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to "image/tif" .<br> Expected : This iframe should have NOTHING .<br>
-<iframe src="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_swf.swf" height="300" width="500"></iframe>
-
-</body>
-</html>
-<script>
-  if(window.layoutTestController)
-    layoutTestController.notifyDone();
-</script>
\ No newline at end of file
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_text_html-expected.txt b/webkit/data/layout_tests/chrome/http/mime/iframe_text_html-expected.txt
deleted file mode 100644
index a748091..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_text_html-expected.txt
+++ /dev/null
@@ -1,240 +0,0 @@
-layer at (0,0) size 785x5152
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x5152
-  RenderBlock {HTML} at (0,0) size 785x5152
-    RenderBody {BODY} at (8,8) size 769x5136
-      RenderText {#text} at (0,0) size 765x36
-        text run at (0,0) width 765: "This HTML is used to test HTTP content-type \"text/html\" by having multiple iframes render different types of content for"
-        text run at (0,18) width 236: "the same HTTP content-type header. "
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (0,36) size 162x18
-        text run at (0,36) width 162: "Well here are the frames !"
-      RenderBR {BR} at (162,50) size 0x0
-      RenderBR {BR} at (0,54) size 0x18
-      RenderBR {BR} at (0,72) size 0x18
-      RenderText {#text} at (0,90) size 698x18
-        text run at (0,90) width 698: "This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (698,104) size 0x0
-      RenderText {#text} at (0,108) size 459x18
-        text run at (0,108) width 459: "Expected : This iframe should have been RENDERED CORRECTLY ."
-      RenderBR {BR} at (459,122) size 0x0
-      RenderPartObject {IFRAME} at (0,126) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,416) size 4x18
-        text run at (504,416) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,434) size 0x18
-      RenderText {#text} at (0,452) size 706x18
-        text run at (0,452) width 706: "This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (706,466) size 0x0
-      RenderText {#text} at (0,470) size 476x18
-        text run at (0,470) width 476: "Expected : This iframe should have been RENDERED INCORRECTLY ."
-      RenderBR {BR} at (476,484) size 0x0
-      RenderPartObject {IFRAME} at (0,488) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,778) size 4x18
-        text run at (504,778) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,796) size 0x18
-      RenderText {#text} at (0,814) size 696x18
-        text run at (0,814) width 696: "This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (696,828) size 0x0
-      RenderText {#text} at (0,832) size 476x18
-        text run at (0,832) width 476: "Expected : This iframe should have been RENDERED INCORRECTLY ."
-      RenderBR {BR} at (476,846) size 0x0
-      RenderPartObject {IFRAME} at (0,850) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1140) size 4x18
-        text run at (504,1140) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1158) size 0x18
-      RenderText {#text} at (0,1176) size 705x18
-        text run at (0,1176) width 705: "This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (705,1190) size 0x0
-      RenderText {#text} at (0,1194) size 459x18
-        text run at (0,1194) width 459: "Expected : This iframe should have been RENDERED CORRECTLY ."
-      RenderBR {BR} at (459,1208) size 0x0
-      RenderPartObject {IFRAME} at (0,1212) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1502) size 4x18
-        text run at (504,1502) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1520) size 0x18
-      RenderText {#text} at (0,1538) size 709x18
-        text run at (0,1538) width 709: "This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (709,1552) size 0x0
-      RenderText {#text} at (0,1556) size 459x18
-        text run at (0,1556) width 459: "Expected : This iframe should have been RENDERED CORRECTLY ."
-      RenderBR {BR} at (459,1570) size 0x0
-      RenderPartObject {IFRAME} at (0,1574) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,1864) size 4x18
-        text run at (504,1864) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,1882) size 0x18
-      RenderText {#text} at (0,1900) size 583x18
-        text run at (0,1900) width 583: "This frame tests loading of a HTML page when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (583,1914) size 0x0
-      RenderText {#text} at (0,1918) size 476x18
-        text run at (0,1918) width 476: "Expected : This iframe should have been RENDERED INCORRECTLY ."
-      RenderBR {BR} at (476,1932) size 0x0
-      RenderPartObject {IFRAME} at (0,1936) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2226) size 4x18
-        text run at (504,2226) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2244) size 0x18
-      RenderText {#text} at (0,2262) size 743x18
-        text run at (0,2262) width 743: "This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (743,2276) size 0x0
-      RenderText {#text} at (0,2280) size 459x18
-        text run at (0,2280) width 459: "Expected : This iframe should have been RENDERED CORRECTLY ."
-      RenderBR {BR} at (459,2294) size 0x0
-      RenderPartObject {IFRAME} at (0,2298) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2588) size 4x18
-        text run at (504,2588) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2606) size 0x18
-      RenderText {#text} at (0,2624) size 668x18
-        text run at (0,2624) width 668: "This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (668,2638) size 0x0
-      RenderText {#text} at (0,2642) size 322x18
-        text run at (0,2642) width 322: "Expected : This iframe should have simple TEXT ."
-      RenderBR {BR} at (322,2656) size 0x0
-      RenderPartObject {IFRAME} at (0,2660) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,2950) size 4x18
-        text run at (504,2950) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,2968) size 0x18
-      RenderText {#text} at (0,2986) size 676x18
-        text run at (0,2986) width 676: "This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (676,3000) size 0x0
-      RenderText {#text} at (0,3004) size 322x18
-        text run at (0,3004) width 322: "Expected : This iframe should have simple TEXT ."
-      RenderBR {BR} at (322,3018) size 0x0
-      RenderPartObject {IFRAME} at (0,3022) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3312) size 4x18
-        text run at (504,3312) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3330) size 0x18
-      RenderText {#text} at (0,3348) size 666x18
-        text run at (0,3348) width 666: "This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (666,3362) size 0x0
-      RenderText {#text} at (0,3366) size 322x18
-        text run at (0,3366) width 322: "Expected : This iframe should have simple TEXT ."
-      RenderBR {BR} at (322,3380) size 0x0
-      RenderPartObject {IFRAME} at (0,3384) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,3674) size 4x18
-        text run at (504,3674) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,3692) size 0x18
-      RenderText {#text} at (0,3710) size 675x18
-        text run at (0,3710) width 675: "This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (675,3724) size 0x0
-      RenderText {#text} at (0,3728) size 322x18
-        text run at (0,3728) width 322: "Expected : This iframe should have simple TEXT ."
-      RenderBR {BR} at (322,3742) size 0x0
-      RenderPartObject {IFRAME} at (0,3746) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4036) size 4x18
-        text run at (504,4036) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4054) size 0x18
-      RenderText {#text} at (0,4072) size 679x18
-        text run at (0,4072) width 679: "This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (679,4086) size 0x0
-      RenderText {#text} at (0,4090) size 322x18
-        text run at (0,4090) width 322: "Expected : This iframe should have simple TEXT ."
-      RenderBR {BR} at (322,4104) size 0x0
-      RenderPartObject {IFRAME} at (0,4108) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4398) size 4x18
-        text run at (504,4398) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4416) size 0x18
-      RenderText {#text} at (0,4434) size 687x18
-        text run at (0,4434) width 687: "This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (687,4448) size 0x0
-      RenderText {#text} at (0,4452) size 322x18
-        text run at (0,4452) width 322: "Expected : This iframe should have simple TEXT ."
-      RenderBR {BR} at (322,4466) size 0x0
-      RenderPartObject {IFRAME} at (0,4470) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (504,4760) size 4x18
-        text run at (504,4760) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderBR {BR} at (0,4778) size 0x18
-      RenderText {#text} at (0,4796) size 694x18
-        text run at (0,4796) width 694: "This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to \"text/html\" ."
-      RenderBR {BR} at (694,4810) size 0x0
-      RenderText {#text} at (0,4814) size 322x18
-        text run at (0,4814) width 322: "Expected : This iframe should have simple TEXT ."
-      RenderBR {BR} at (322,4828) size 0x0
-      RenderPartObject {IFRAME} at (0,4832) size 504x304 [border: (2px inset #000000)]
-        layer at (0,0) size 500x300
-          RenderView at (0,0) size 500x300
-        layer at (0,0) size 500x300
-          RenderBlock {HTML} at (0,0) size 500x300
-            RenderBody {BODY} at (8,8) size 484x284
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/chrome/http/mime/iframe_text_html.html b/webkit/data/layout_tests/chrome/http/mime/iframe_text_html.html
deleted file mode 100644
index 13468ce..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/iframe_text_html.html
+++ /dev/null
@@ -1,56 +0,0 @@
-This HTML is used to test HTTP content-type "text/html" by having multiple iframes render different types of content for the same HTTP content-type header.
-<script>
-  if(window.layoutTestController)
-    window.layoutTestController.waitUntilDone();
-</script>
-<html>
-<body>
-<br>Well here are the frames !<br>
-<br><br>This frame tests loading of a HTML page with a GIF image when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have been RENDERED CORRECTLY .<br>
-<iframe src="resources/getpage.pl?type=text/html&tag=img&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a BMP image when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have been RENDERED INCORRECTLY .<br>
-<iframe src="resources/getpage.pl?type=text/html&tag=img&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a TIF image when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have been RENDERED INCORRECTLY .<br>
-<iframe src="resources/getpage.pl?type=text/html&tag=img&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a PNG image when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have been RENDERED CORRECTLY .<br>
-<iframe src="resources/getpage.pl?type=text/html&tag=img&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have been RENDERED CORRECTLY .<br>
-<iframe src="resources/getpage.pl?type=text/html&tag=img&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a HTML page when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have been RENDERED INCORRECTLY .<br>
-<iframe src="resources/getpage.pl?type=text/html&tag=img&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have been RENDERED CORRECTLY .<br>
-<iframe src="resources/getpage.pl?type=text/html&tag=embed&content=type_swf.swf" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a GIF image and no HTML when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have simple TEXT .<br>
-<iframe src="resources/getpage.pl?type=text/html&switch=nohtml&content=type_gif.gif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a BMP image and no HTML when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have simple TEXT .<br>
-<iframe src="resources/getpage.pl?type=text/html&switch=nohtml&content=type_bmp.bmp" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a TIF image and no HTML when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have simple TEXT .<br>
-<iframe src="resources/getpage.pl?type=text/html&switch=nohtml&content=type_tif.tif" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a PNG image and no HTML when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have simple TEXT .<br>
-<iframe src="resources/getpage.pl?type=text/html&switch=nohtml&content=type_png.png" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a JPEG image and no HTML when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have simple TEXT .<br>
-<iframe src="resources/getpage.pl?type=text/html&switch=nohtml&content=type_jpg.jpg" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have simple TEXT .<br>
-<iframe src="resources/getpage.pl?type=text/html&switch=nohtml&content=type_txt.txt" height="300" width="500"></iframe>
-
-<br><br>This frame tests loading of a FLASH object and no HTML when the HTTP content-type is set to "text/html" .<br> Expected : This iframe should have simple TEXT .<br>
-<iframe src="resources/getpage.pl?type=text/html&switch=nohtml&content=type_swf.swf" height="300" width="500"></iframe>
-
-</body>
-</html>
-<script>
-  if(window.layoutTestController)
-    layoutTestController.notifyDone();
-</script>
\ No newline at end of file
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL1-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL1-expected.txt
deleted file mode 100644
index 26f1d1c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL1-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 784x36
-        text run at (0,0) width 651: "This tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"NULL\" . "
-        text run at (651,0) width 133: "Expected : This page"
-        text run at (0,18) width 197: "should have an HTML as text ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL1.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL1.html
deleted file mode 100644
index 8703dff..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a GIF image when the HTTP content-type is set to "NULL" .
- Expected : This page should have an HTML as text .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&tag=img&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL10-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL10-expected.txt
deleted file mode 100644
index a5da3ed..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL10-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 752x36
-        text run at (0,0) width 619: "This tests loading of a TIF image and no HTML when the HTTP content-type is set to \"NULL\" . "
-        text run at (619,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL10.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL10.html
deleted file mode 100644
index 3602088..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL10.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a TIF image and no HTML when the HTTP content-type is set to "NULL" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&switch=nohtml&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL11-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL11-expected.txt
deleted file mode 100644
index 5709275..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL11-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 761x36
-        text run at (0,0) width 628: "This tests loading of a PNG image and no HTML when the HTTP content-type is set to \"NULL\" . "
-        text run at (628,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL11.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL11.html
deleted file mode 100644
index 5f59f95..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL11.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a PNG image and no HTML when the HTTP content-type is set to "NULL" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&switch=nohtml&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL12-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL12-expected.txt
deleted file mode 100644
index 5a68e76..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL12-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 765x36
-        text run at (0,0) width 632: "This tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"NULL\" . "
-        text run at (632,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL12.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL12.html
deleted file mode 100644
index 8f0e7ab..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL12.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a JPEG image and no HTML when the HTTP content-type is set to "NULL" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&switch=nohtml&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL13-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL13-expected.txt
deleted file mode 100644
index a425d2e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL13-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 773x36
-        text run at (0,0) width 640: "This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"NULL\" . "
-        text run at (640,0) width 133: "Expected : This page"
-        text run at (0,18) width 175: "should have simple TEXT ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL13.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL13.html
deleted file mode 100644
index 582ac11..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL13.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "NULL" .
- Expected : This page should have simple TEXT .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&switch=nohtml&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL2-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL2-expected.txt
deleted file mode 100644
index 4776bbe..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL2-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 758x36
-        text run at (0,0) width 659: "This tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"NULL\" . "
-        text run at (659,0) width 99: "Expected : This"
-        text run at (0,18) width 231: "page should have an HTML as text ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL2.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL2.html
deleted file mode 100644
index cf9017f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a BMP image when the HTTP content-type is set to "NULL" .
- Expected : This page should have an HTML as text .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&tag=img&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL3-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL3-expected.txt
deleted file mode 100644
index c161e10..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL3-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 782x36
-        text run at (0,0) width 649: "This tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"NULL\" . "
-        text run at (649,0) width 133: "Expected : This page"
-        text run at (0,18) width 197: "should have an HTML as text ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL3.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL3.html
deleted file mode 100644
index 6125713..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL3.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a TIF image when the HTTP content-type is set to "NULL" .
- Expected : This page should have an HTML as text .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&tag=img&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL4-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL4-expected.txt
deleted file mode 100644
index 211d312..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL4-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 757x36
-        text run at (0,0) width 658: "This tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"NULL\" . "
-        text run at (658,0) width 99: "Expected : This"
-        text run at (0,18) width 231: "page should have an HTML as text ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL4.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL4.html
deleted file mode 100644
index 44d7520..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL4.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a PNG image when the HTTP content-type is set to "NULL" .
- Expected : This page should have an HTML as text .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&tag=img&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL5-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL5-expected.txt
deleted file mode 100644
index 08aa13e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL5-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 761x36
-        text run at (0,0) width 662: "This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"NULL\" . "
-        text run at (662,0) width 99: "Expected : This"
-        text run at (0,18) width 231: "page should have an HTML as text ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL5.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL5.html
deleted file mode 100644
index 893d39d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL5.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "NULL" .
- Expected : This page should have an HTML as text .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&tag=img&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL6-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL6-expected.txt
deleted file mode 100644
index 04807b2..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL6-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 768x36
-        text run at (0,0) width 536: "This tests loading of a HTML page when the HTTP content-type is set to \"NULL\" . "
-        text run at (536,0) width 232: "Expected : This page should have an"
-        text run at (0,18) width 98: "HTML as text ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL6.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL6.html
deleted file mode 100644
index 564a72d4..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL6.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page when the HTTP content-type is set to "NULL" .
- Expected : This page should have an HTML as text .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&tag=img&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL7-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL7-expected.txt
deleted file mode 100644
index cb3f127..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL7-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 763x36
-        text run at (0,0) width 696: "This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"NULL\" . "
-        text run at (696,0) width 67: "Expected :"
-        text run at (0,18) width 263: "This page should have an HTML as text ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL7.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL7.html
deleted file mode 100644
index 2c9822d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL7.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "NULL" .
- Expected : This page should have an HTML as text .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&tag=embed&content=type_swf.swf";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL8-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL8-expected.txt
deleted file mode 100644
index 040da1d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL8-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 754x36
-        text run at (0,0) width 621: "This tests loading of a GIF image and no HTML when the HTTP content-type is set to \"NULL\" . "
-        text run at (621,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL8.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL8.html
deleted file mode 100644
index 88560ed7..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL8.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a GIF image and no HTML when the HTTP content-type is set to "NULL" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&switch=nohtml&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL9-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_NULL9-expected.txt
deleted file mode 100644
index c8fe1af..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL9-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 762x36
-        text run at (0,0) width 629: "This tests loading of a BMP image and no HTML when the HTTP content-type is set to \"NULL\" . "
-        text run at (629,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_NULL9.html b/webkit/data/layout_tests/chrome/http/mime/main_NULL9.html
deleted file mode 100644
index 49fdfc3..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_NULL9.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a BMP image and no HTML when the HTTP content-type is set to "NULL" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=NULL&switch=nohtml&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash1-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash1-expected.txt
deleted file mode 100644
index 293c94f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash1-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 750x36
-        text run at (0,0) width 750: "This tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"application/x-shockwave-"
-        text run at (0,18) width 49: "flash\" . "
-        text run at (49,18) width 300: "Expected : This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash1.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash1.html
deleted file mode 100644
index e01eb7b..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a GIF image when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash10-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash10-expected.txt
deleted file mode 100644
index 1b19bb9..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash10-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 763x36
-        text run at (0,0) width 763: "This tests loading of a TIF image and no HTML when the HTTP content-type is set to \"application/x-shockwave-flash\" ."
-        text run at (0,18) width 300: "Expected : This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash10.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash10.html
deleted file mode 100644
index dea024b..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash10.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a TIF image and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash11-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash11-expected.txt
deleted file mode 100644
index 9001e2d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash11-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 772x36
-        text run at (0,0) width 772: "This tests loading of a PNG image and no HTML when the HTTP content-type is set to \"application/x-shockwave-flash\" ."
-        text run at (0,18) width 330: "Expected : This page should have a FLASH object ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash11.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash11.html
deleted file mode 100644
index 8bc3488..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash11.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a PNG image and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have a FLASH object .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash12-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash12-expected.txt
deleted file mode 100644
index 4191215..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash12-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 776x36
-        text run at (0,0) width 776: "This tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"application/x-shockwave-flash\" ."
-        text run at (0,18) width 330: "Expected : This page should have a FLASH object ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash12.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash12.html
deleted file mode 100644
index ac678d2..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash12.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a JPEG image and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have a FLASH object .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash13-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash13-expected.txt
deleted file mode 100644
index ae9571c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash13-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 784x36
-        text run at (0,0) width 784: "This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"application/x-shockwave-flash\" ."
-        text run at (0,18) width 300: "Expected : This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash13.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash13.html
deleted file mode 100644
index a8aff51..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash13.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash2-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash2-expected.txt
deleted file mode 100644
index cd81b43..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash2-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 758x36
-        text run at (0,0) width 758: "This tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"application/x-shockwave-"
-        text run at (0,18) width 49: "flash\" . "
-        text run at (49,18) width 300: "Expected : This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash2.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash2.html
deleted file mode 100644
index b6fc1a6..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a BMP image when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash3-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash3-expected.txt
deleted file mode 100644
index 8ec6356..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash3-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 748x36
-        text run at (0,0) width 748: "This tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"application/x-shockwave-"
-        text run at (0,18) width 49: "flash\" . "
-        text run at (49,18) width 300: "Expected : This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash3.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash3.html
deleted file mode 100644
index 362ac88..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash3.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a TIF image when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash4-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash4-expected.txt
deleted file mode 100644
index cd64470..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash4-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 757x36
-        text run at (0,0) width 757: "This tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"application/x-shockwave-"
-        text run at (0,18) width 49: "flash\" . "
-        text run at (49,18) width 300: "Expected : This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash4.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash4.html
deleted file mode 100644
index fda3441..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash4.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a PNG image when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash5-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash5-expected.txt
deleted file mode 100644
index 7ce14f4..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash5-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 761x36
-        text run at (0,0) width 761: "This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"application/x-shockwave-"
-        text run at (0,18) width 49: "flash\" . "
-        text run at (49,18) width 300: "Expected : This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash5.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash5.html
deleted file mode 100644
index 87415a8..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash5.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash6-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash6-expected.txt
deleted file mode 100644
index e596932..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash6-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 783x36
-        text run at (0,0) width 684: "This tests loading of a HTML page when the HTTP content-type is set to \"application/x-shockwave-flash\" . "
-        text run at (684,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash6.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash6.html
deleted file mode 100644
index 3d233ff..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash6.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&tag=img&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash7-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash7-expected.txt
deleted file mode 100644
index d7880b0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash7-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 719x36
-        text run at (0,0) width 719: "This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"application/x-"
-        text run at (0,18) width 125: "shockwave-flash\" . "
-        text run at (125,18) width 300: "Expected : This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash7.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash7.html
deleted file mode 100644
index 11d98db..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash7.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&tag=embed&content=type_swf.swf";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash8-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash8-expected.txt
deleted file mode 100644
index 5daa8d0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash8-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 765x36
-        text run at (0,0) width 765: "This tests loading of a GIF image and no HTML when the HTTP content-type is set to \"application/x-shockwave-flash\" ."
-        text run at (0,18) width 330: "Expected : This page should have a FLASH object ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash8.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash8.html
deleted file mode 100644
index d3114c9..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash8.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a GIF image and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have a FLASH object .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash9-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash9-expected.txt
deleted file mode 100644
index 811742a..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash9-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 773x36
-        text run at (0,0) width 773: "This tests loading of a BMP image and no HTML when the HTTP content-type is set to \"application/x-shockwave-flash\" ."
-        text run at (0,18) width 300: "Expected : This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash9.html b/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash9.html
deleted file mode 100644
index 62194ad..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_application_x-shockwave-flash9.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a BMP image and no HTML when the HTTP content-type is set to "application/x-shockwave-flash" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=application/x-shockwave-flash&switch=nohtml&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp1-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp1-expected.txt
deleted file mode 100644
index 2b95cc9..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp1-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 776x36
-        text run at (0,0) width 677: "This tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (677,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp1.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp1.html
deleted file mode 100644
index 0ea0ed9..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a GIF image when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&tag=img&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp10-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp10-expected.txt
deleted file mode 100644
index e0cd180..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp10-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 778x36
-        text run at (0,0) width 645: "This tests loading of a TIF image and no HTML when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (645,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp10.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp10.html
deleted file mode 100644
index a83e599..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp10.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a TIF image and no HTML when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp11-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp11-expected.txt
deleted file mode 100644
index 4f839d8..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp11-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 753x36
-        text run at (0,0) width 654: "This tests loading of a PNG image and no HTML when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (654,0) width 99: "Expected : This"
-        text run at (0,18) width 194: "page should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp11.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp11.html
deleted file mode 100644
index 65f28fb..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp11.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a PNG image and no HTML when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp12-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp12-expected.txt
deleted file mode 100644
index ad7b29b..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp12-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 757x36
-        text run at (0,0) width 658: "This tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (658,0) width 99: "Expected : This"
-        text run at (0,18) width 194: "page should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp12.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp12.html
deleted file mode 100644
index 83dccaa..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp12.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a JPEG image and no HTML when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp13-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp13-expected.txt
deleted file mode 100644
index eb500ae..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp13-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 765x36
-        text run at (0,0) width 666: "This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (666,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp13.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp13.html
deleted file mode 100644
index 735389a..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp13.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp2-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp2-expected.txt
deleted file mode 100644
index 3c33de3..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp2-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 784x36
-        text run at (0,0) width 685: "This tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (685,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp2.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp2.html
deleted file mode 100644
index 3052e5a..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a BMP image when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&tag=img&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp3-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp3-expected.txt
deleted file mode 100644
index f0a734f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp3-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 774x36
-        text run at (0,0) width 675: "This tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (675,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp3.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp3.html
deleted file mode 100644
index 89d26e1..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp3.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a TIF image when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&tag=img&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp4-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp4-expected.txt
deleted file mode 100644
index f4711ea..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp4-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 783x36
-        text run at (0,0) width 684: "This tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (684,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp4.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp4.html
deleted file mode 100644
index d4fb57f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp4.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a PNG image when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&tag=img&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp5-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp5-expected.txt
deleted file mode 100644
index 5d6424c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp5-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 755x36
-        text run at (0,0) width 688: "This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (688,0) width 67: "Expected :"
-        text run at (0,18) width 229: "This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp5.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp5.html
deleted file mode 100644
index ef5a1a6..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp5.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&tag=img&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp6-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp6-expected.txt
deleted file mode 100644
index f776178..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp6-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 775x36
-        text run at (0,0) width 562: "This tests loading of a HTML page when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (562,0) width 213: "Expected : This page should have"
-        text run at (0,18) width 83: "NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp6.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp6.html
deleted file mode 100644
index 5b227d1..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp6.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&tag=img&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp7-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp7-expected.txt
deleted file mode 100644
index ef1ac7d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp7-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 781x36
-        text run at (0,0) width 722: "This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (722,0) width 59: "Expected"
-        text run at (0,18) width 237: ": This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp7.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp7.html
deleted file mode 100644
index 3dbaa5e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp7.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&tag=embed&content=type_swf.swf";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp8-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp8-expected.txt
deleted file mode 100644
index a5c3ce0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp8-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 780x36
-        text run at (0,0) width 647: "This tests loading of a GIF image and no HTML when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (647,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp8.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp8.html
deleted file mode 100644
index a080b70..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp8.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a GIF image and no HTML when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp9-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp9-expected.txt
deleted file mode 100644
index aac27dc..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp9-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 754x36
-        text run at (0,0) width 655: "This tests loading of a BMP image and no HTML when the HTTP content-type is set to \"image/bmp\" . "
-        text run at (655,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp9.html b/webkit/data/layout_tests/chrome/http/mime/main_image_bmp9.html
deleted file mode 100644
index 99171fa..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_bmp9.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a BMP image and no HTML when the HTTP content-type is set to "image/bmp" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/bmp&switch=nohtml&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif1-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif1-expected.txt
deleted file mode 100644
index 89e6e1e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif1-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 765x36
-        text run at (0,0) width 666: "This tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"image/gif\" . "
-        text run at (666,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif1.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif1.html
deleted file mode 100644
index 14461e0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a GIF image when the HTTP content-type is set to "image/gif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&tag=img&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif10-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif10-expected.txt
deleted file mode 100644
index 75178eb..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif10-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 767x36
-        text run at (0,0) width 634: "This tests loading of a TIF image and no HTML when the HTTP content-type is set to \"image/gif\" . "
-        text run at (634,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif10.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif10.html
deleted file mode 100644
index 7723fea..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif10.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a TIF image and no HTML when the HTTP content-type is set to "image/gif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif11-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif11-expected.txt
deleted file mode 100644
index 903dbb7..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif11-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 776x36
-        text run at (0,0) width 643: "This tests loading of a PNG image and no HTML when the HTTP content-type is set to \"image/gif\" . "
-        text run at (643,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif11.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif11.html
deleted file mode 100644
index 5c5dd33..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif11.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a PNG image and no HTML when the HTTP content-type is set to "image/gif" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif12-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif12-expected.txt
deleted file mode 100644
index 285bc8a..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif12-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 780x36
-        text run at (0,0) width 647: "This tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"image/gif\" . "
-        text run at (647,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif12.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif12.html
deleted file mode 100644
index b78cd0a..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif12.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a JPEG image and no HTML when the HTTP content-type is set to "image/gif" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif13-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif13-expected.txt
deleted file mode 100644
index 1c3c2a1..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif13-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 754x36
-        text run at (0,0) width 655: "This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"image/gif\" . "
-        text run at (655,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif13.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif13.html
deleted file mode 100644
index a23d8eb..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif13.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "image/gif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif2-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif2-expected.txt
deleted file mode 100644
index 003baa7..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif2-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 773x36
-        text run at (0,0) width 674: "This tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"image/gif\" . "
-        text run at (674,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif2.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif2.html
deleted file mode 100644
index e17f2cc..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a BMP image when the HTTP content-type is set to "image/gif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&tag=img&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif3-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif3-expected.txt
deleted file mode 100644
index dcf71a6..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif3-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 763x36
-        text run at (0,0) width 664: "This tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"image/gif\" . "
-        text run at (664,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif3.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif3.html
deleted file mode 100644
index 1e54e63..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif3.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a TIF image when the HTTP content-type is set to "image/gif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&tag=img&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif4-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif4-expected.txt
deleted file mode 100644
index 8cdb88c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif4-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 772x36
-        text run at (0,0) width 673: "This tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"image/gif\" . "
-        text run at (673,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif4.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif4.html
deleted file mode 100644
index 8c49e08..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif4.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a PNG image when the HTTP content-type is set to "image/gif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&tag=img&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif5-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif5-expected.txt
deleted file mode 100644
index 3eb90e7..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif5-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 776x36
-        text run at (0,0) width 677: "This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"image/gif\" . "
-        text run at (677,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif5.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif5.html
deleted file mode 100644
index 889424e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif5.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "image/gif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&tag=img&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif6-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif6-expected.txt
deleted file mode 100644
index 580ad65..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif6-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 764x36
-        text run at (0,0) width 551: "This tests loading of a HTML page when the HTTP content-type is set to \"image/gif\" . "
-        text run at (551,0) width 213: "Expected : This page should have"
-        text run at (0,18) width 83: "NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif6.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif6.html
deleted file mode 100644
index 07a199d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif6.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page when the HTTP content-type is set to "image/gif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&tag=img&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif7-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif7-expected.txt
deleted file mode 100644
index 42031c1..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif7-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 778x36
-        text run at (0,0) width 711: "This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"image/gif\" . "
-        text run at (711,0) width 67: "Expected :"
-        text run at (0,18) width 229: "This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif7.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif7.html
deleted file mode 100644
index de598b0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif7.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "image/gif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&tag=embed&content=type_swf.swf";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif8-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif8-expected.txt
deleted file mode 100644
index 0386cf7..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif8-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 769x36
-        text run at (0,0) width 636: "This tests loading of a GIF image and no HTML when the HTTP content-type is set to \"image/gif\" . "
-        text run at (636,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif8.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif8.html
deleted file mode 100644
index 5b61a33..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif8.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a GIF image and no HTML when the HTTP content-type is set to "image/gif" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif9-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_gif9-expected.txt
deleted file mode 100644
index d78300e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif9-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 777x36
-        text run at (0,0) width 644: "This tests loading of a BMP image and no HTML when the HTTP content-type is set to \"image/gif\" . "
-        text run at (644,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_gif9.html b/webkit/data/layout_tests/chrome/http/mime/main_image_gif9.html
deleted file mode 100644
index 3efcd3d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_gif9.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a BMP image and no HTML when the HTTP content-type is set to "image/gif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/gif&switch=nohtml&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg1-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg1-expected.txt
deleted file mode 100644
index b8bd505..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg1-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 768x36
-        text run at (0,0) width 669: "This tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (669,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg1.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg1.html
deleted file mode 100644
index 97661df..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a GIF image when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&tag=img&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg10-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg10-expected.txt
deleted file mode 100644
index 5552e6c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg10-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 770x36
-        text run at (0,0) width 637: "This tests loading of a TIF image and no HTML when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (637,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg10.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg10.html
deleted file mode 100644
index 0139ce0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg10.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a TIF image and no HTML when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg11-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg11-expected.txt
deleted file mode 100644
index 67acecb..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg11-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 779x36
-        text run at (0,0) width 646: "This tests loading of a PNG image and no HTML when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (646,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg11.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg11.html
deleted file mode 100644
index 1ffcf341..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg11.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a PNG image and no HTML when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg12-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg12-expected.txt
deleted file mode 100644
index ab74589..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg12-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 783x36
-        text run at (0,0) width 650: "This tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (650,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg12.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg12.html
deleted file mode 100644
index 6f57e3c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg12.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a JPEG image and no HTML when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg13-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg13-expected.txt
deleted file mode 100644
index 5e309ea..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg13-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 757x36
-        text run at (0,0) width 658: "This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (658,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg13.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg13.html
deleted file mode 100644
index 3a81e3c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg13.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg2-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg2-expected.txt
deleted file mode 100644
index e34fb23..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg2-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 776x36
-        text run at (0,0) width 677: "This tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (677,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg2.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg2.html
deleted file mode 100644
index 2637359..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a BMP image when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&tag=img&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg3-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg3-expected.txt
deleted file mode 100644
index 68ff564..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg3-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 766x36
-        text run at (0,0) width 667: "This tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (667,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg3.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg3.html
deleted file mode 100644
index 562efe5..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg3.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a TIF image when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&tag=img&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg4-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg4-expected.txt
deleted file mode 100644
index f669d0c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg4-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 775x36
-        text run at (0,0) width 676: "This tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (676,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg4.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg4.html
deleted file mode 100644
index b084e7d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg4.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a PNG image when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&tag=img&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg5-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg5-expected.txt
deleted file mode 100644
index 3fa8f49..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg5-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 779x36
-        text run at (0,0) width 680: "This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (680,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg5.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg5.html
deleted file mode 100644
index 4ef3547..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg5.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&tag=img&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg6-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg6-expected.txt
deleted file mode 100644
index 5516c7b..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg6-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 767x36
-        text run at (0,0) width 554: "This tests loading of a HTML page when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (554,0) width 213: "Expected : This page should have"
-        text run at (0,18) width 83: "NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg6.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg6.html
deleted file mode 100644
index b053b8a..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg6.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&tag=img&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg7-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg7-expected.txt
deleted file mode 100644
index 78bd0f4..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg7-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 781x36
-        text run at (0,0) width 714: "This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (714,0) width 67: "Expected :"
-        text run at (0,18) width 229: "This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg7.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg7.html
deleted file mode 100644
index 589c96c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg7.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&tag=embed&content=type_swf.swf";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg8-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg8-expected.txt
deleted file mode 100644
index 82f9ca3..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg8-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 772x36
-        text run at (0,0) width 639: "This tests loading of a GIF image and no HTML when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (639,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg8.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg8.html
deleted file mode 100644
index 33dc419..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg8.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a GIF image and no HTML when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg9-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg9-expected.txt
deleted file mode 100644
index f5a711e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg9-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 780x36
-        text run at (0,0) width 647: "This tests loading of a BMP image and no HTML when the HTTP content-type is set to \"image/jpg\" . "
-        text run at (647,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg9.html b/webkit/data/layout_tests/chrome/http/mime/main_image_jpg9.html
deleted file mode 100644
index c347d76..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_jpg9.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a BMP image and no HTML when the HTTP content-type is set to "image/jpg" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/jpg&switch=nohtml&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png1-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png1-expected.txt
deleted file mode 100644
index 7b830f8..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png1-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 772x36
-        text run at (0,0) width 673: "This tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"image/png\" . "
-        text run at (673,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png1.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png1.html
deleted file mode 100644
index 5af2e2f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a GIF image when the HTTP content-type is set to "image/png" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&tag=img&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png10-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png10-expected.txt
deleted file mode 100644
index 1efc024..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png10-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 774x36
-        text run at (0,0) width 641: "This tests loading of a TIF image and no HTML when the HTTP content-type is set to \"image/png\" . "
-        text run at (641,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png10.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png10.html
deleted file mode 100644
index 0539da7..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png10.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a TIF image and no HTML when the HTTP content-type is set to "image/png" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&switch=nohtml&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png11-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png11-expected.txt
deleted file mode 100644
index ba67a6d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png11-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 783x36
-        text run at (0,0) width 650: "This tests loading of a PNG image and no HTML when the HTTP content-type is set to \"image/png\" . "
-        text run at (650,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png11.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png11.html
deleted file mode 100644
index 0add9d3..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png11.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a PNG image and no HTML when the HTTP content-type is set to "image/png" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&switch=nohtml&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png12-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png12-expected.txt
deleted file mode 100644
index 336544d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png12-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 753x36
-        text run at (0,0) width 654: "This tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"image/png\" . "
-        text run at (654,0) width 99: "Expected : This"
-        text run at (0,18) width 194: "page should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png12.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png12.html
deleted file mode 100644
index cbb143b..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png12.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a JPEG image and no HTML when the HTTP content-type is set to "image/png" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&switch=nohtml&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png13-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png13-expected.txt
deleted file mode 100644
index dee43b0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png13-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 761x36
-        text run at (0,0) width 662: "This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"image/png\" . "
-        text run at (662,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png13.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png13.html
deleted file mode 100644
index 5a9d71b..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png13.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "image/png" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&switch=nohtml&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png2-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png2-expected.txt
deleted file mode 100644
index 59763ac..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png2-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 780x36
-        text run at (0,0) width 681: "This tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"image/png\" . "
-        text run at (681,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png2.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png2.html
deleted file mode 100644
index fa3e894..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a BMP image when the HTTP content-type is set to "image/png" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&tag=img&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png3-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png3-expected.txt
deleted file mode 100644
index a2840af..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png3-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 770x36
-        text run at (0,0) width 671: "This tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"image/png\" . "
-        text run at (671,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png3.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png3.html
deleted file mode 100644
index 93066d8..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png3.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a TIF image when the HTTP content-type is set to "image/png" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&tag=img&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png4-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png4-expected.txt
deleted file mode 100644
index 567048e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png4-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 779x36
-        text run at (0,0) width 680: "This tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"image/png\" . "
-        text run at (680,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png4.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png4.html
deleted file mode 100644
index e386d50..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png4.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a PNG image when the HTTP content-type is set to "image/png" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&tag=img&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png5-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png5-expected.txt
deleted file mode 100644
index 8b39217..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png5-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 783x36
-        text run at (0,0) width 684: "This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"image/png\" . "
-        text run at (684,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png5.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png5.html
deleted file mode 100644
index 1c3f146..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png5.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "image/png" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&tag=img&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png6-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png6-expected.txt
deleted file mode 100644
index cebb6d9..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png6-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 771x36
-        text run at (0,0) width 558: "This tests loading of a HTML page when the HTTP content-type is set to \"image/png\" . "
-        text run at (558,0) width 213: "Expected : This page should have"
-        text run at (0,18) width 83: "NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png6.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png6.html
deleted file mode 100644
index de9ef15..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png6.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page when the HTTP content-type is set to "image/png" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&tag=img&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png7-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png7-expected.txt
deleted file mode 100644
index 8b51c42..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png7-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 777x36
-        text run at (0,0) width 718: "This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"image/png\" . "
-        text run at (718,0) width 59: "Expected"
-        text run at (0,18) width 237: ": This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png7.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png7.html
deleted file mode 100644
index afc27e2..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png7.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "image/png" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&tag=embed&content=type_swf.swf";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png8-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png8-expected.txt
deleted file mode 100644
index b3c4d01..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png8-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 776x36
-        text run at (0,0) width 643: "This tests loading of a GIF image and no HTML when the HTTP content-type is set to \"image/png\" . "
-        text run at (643,0) width 133: "Expected : This page"
-        text run at (0,18) width 160: "should have an IMAGE ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png8.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png8.html
deleted file mode 100644
index 686a03af..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png8.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a GIF image and no HTML when the HTTP content-type is set to "image/png" .
- Expected : This page should have an IMAGE .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&switch=nohtml&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png9-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_png9-expected.txt
deleted file mode 100644
index a6f3101..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png9-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 784x36
-        text run at (0,0) width 651: "This tests loading of a BMP image and no HTML when the HTTP content-type is set to \"image/png\" . "
-        text run at (651,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_png9.html b/webkit/data/layout_tests/chrome/http/mime/main_image_png9.html
deleted file mode 100644
index 28b8ad1..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_png9.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a BMP image and no HTML when the HTTP content-type is set to "image/png" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/png&switch=nohtml&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif1-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif1-expected.txt
deleted file mode 100644
index b1610e7..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif1-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 761x36
-        text run at (0,0) width 662: "This tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"image/tif\" . "
-        text run at (662,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif1.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif1.html
deleted file mode 100644
index 76161fa..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a GIF image when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&tag=img&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif10-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif10-expected.txt
deleted file mode 100644
index 3c3f7c4..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif10-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 763x36
-        text run at (0,0) width 630: "This tests loading of a TIF image and no HTML when the HTTP content-type is set to \"image/tif\" . "
-        text run at (630,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif10.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif10.html
deleted file mode 100644
index b6551cc..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif10.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a TIF image and no HTML when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif11-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif11-expected.txt
deleted file mode 100644
index 2e42f12..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif11-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 772x36
-        text run at (0,0) width 639: "This tests loading of a PNG image and no HTML when the HTTP content-type is set to \"image/tif\" . "
-        text run at (639,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif11.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif11.html
deleted file mode 100644
index aae1832..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif11.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a PNG image and no HTML when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif12-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif12-expected.txt
deleted file mode 100644
index a33810f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif12-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 776x36
-        text run at (0,0) width 643: "This tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"image/tif\" . "
-        text run at (643,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif12.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif12.html
deleted file mode 100644
index c0861e8..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif12.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a JPEG image and no HTML when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif13-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif13-expected.txt
deleted file mode 100644
index 71146a0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif13-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 784x36
-        text run at (0,0) width 651: "This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"image/tif\" . "
-        text run at (651,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif13.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif13.html
deleted file mode 100644
index 8559b3c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif13.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif2-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif2-expected.txt
deleted file mode 100644
index 96556b6..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif2-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 769x36
-        text run at (0,0) width 670: "This tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"image/tif\" . "
-        text run at (670,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif2.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif2.html
deleted file mode 100644
index 5aec7fc..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a BMP image when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&tag=img&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif3-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif3-expected.txt
deleted file mode 100644
index e54b7cb..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif3-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 759x36
-        text run at (0,0) width 660: "This tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"image/tif\" . "
-        text run at (660,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif3.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif3.html
deleted file mode 100644
index ceae2d5..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif3.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a TIF image when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&tag=img&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif4-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif4-expected.txt
deleted file mode 100644
index 00b4f11..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif4-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 768x36
-        text run at (0,0) width 669: "This tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"image/tif\" . "
-        text run at (669,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif4.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif4.html
deleted file mode 100644
index f84e643..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif4.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a PNG image when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&tag=img&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif5-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif5-expected.txt
deleted file mode 100644
index 9b7f954..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif5-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 772x36
-        text run at (0,0) width 673: "This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"image/tif\" . "
-        text run at (673,0) width 99: "Expected : This"
-        text run at (0,18) width 197: "page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif5.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif5.html
deleted file mode 100644
index ee0da4f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif5.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&tag=img&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif6-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif6-expected.txt
deleted file mode 100644
index 68ec1aa..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif6-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 760x36
-        text run at (0,0) width 547: "This tests loading of a HTML page when the HTTP content-type is set to \"image/tif\" . "
-        text run at (547,0) width 213: "Expected : This page should have"
-        text run at (0,18) width 83: "NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif6.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif6.html
deleted file mode 100644
index 8383e71..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif6.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&tag=img&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif7-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif7-expected.txt
deleted file mode 100644
index 991a340..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif7-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 774x36
-        text run at (0,0) width 707: "This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"image/tif\" . "
-        text run at (707,0) width 67: "Expected :"
-        text run at (0,18) width 229: "This page should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif7.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif7.html
deleted file mode 100644
index 15d9ec0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif7.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&tag=embed&content=type_swf.swf";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif8-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif8-expected.txt
deleted file mode 100644
index 7182890..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif8-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 765x36
-        text run at (0,0) width 632: "This tests loading of a GIF image and no HTML when the HTTP content-type is set to \"image/tif\" . "
-        text run at (632,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif8.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif8.html
deleted file mode 100644
index 6cc02ff..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif8.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a GIF image and no HTML when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif9-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_image_tif9-expected.txt
deleted file mode 100644
index 3caae89..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif9-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 773x36
-        text run at (0,0) width 640: "This tests loading of a BMP image and no HTML when the HTTP content-type is set to \"image/tif\" . "
-        text run at (640,0) width 133: "Expected : This page"
-        text run at (0,18) width 163: "should have NOTHING ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_image_tif9.html b/webkit/data/layout_tests/chrome/http/mime/main_image_tif9.html
deleted file mode 100644
index 4234418..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_image_tif9.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a BMP image and no HTML when the HTTP content-type is set to "image/tif" .
- Expected : This page should have NOTHING .
-
-<script>
-  window.location="resources/getpage.pl?type=image/tif&switch=nohtml&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html1-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html1-expected.txt
deleted file mode 100644
index 9d0f42c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html1-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 761x36
-        text run at (0,0) width 662: "This tests loading of a HTML page with a GIF image when the HTTP content-type is set to \"text/html\" . "
-        text run at (662,0) width 99: "Expected : This"
-        text run at (0,18) width 346: "page should have been RENDERED CORRECTLY ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html1.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html1.html
deleted file mode 100644
index 0b6ea05..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a GIF image when the HTTP content-type is set to "text/html" .
- Expected : This page should have been RENDERED CORRECTLY .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&tag=img&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html10-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html10-expected.txt
deleted file mode 100644
index 5a6be33..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html10-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 763x36
-        text run at (0,0) width 630: "This tests loading of a TIF image and no HTML when the HTTP content-type is set to \"text/html\" . "
-        text run at (630,0) width 133: "Expected : This page"
-        text run at (0,18) width 175: "should have simple TEXT ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html10.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html10.html
deleted file mode 100644
index 7f57252b..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html10.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a TIF image and no HTML when the HTTP content-type is set to "text/html" .
- Expected : This page should have simple TEXT .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&switch=nohtml&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html11-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html11-expected.txt
deleted file mode 100644
index 180c61f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html11-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 772x36
-        text run at (0,0) width 639: "This tests loading of a PNG image and no HTML when the HTTP content-type is set to \"text/html\" . "
-        text run at (639,0) width 133: "Expected : This page"
-        text run at (0,18) width 175: "should have simple TEXT ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html11.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html11.html
deleted file mode 100644
index b5b9632..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html11.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a PNG image and no HTML when the HTTP content-type is set to "text/html" .
- Expected : This page should have simple TEXT .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&switch=nohtml&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html12-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html12-expected.txt
deleted file mode 100644
index ef2f5ac..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html12-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 776x36
-        text run at (0,0) width 643: "This tests loading of a JPEG image and no HTML when the HTTP content-type is set to \"text/html\" . "
-        text run at (643,0) width 133: "Expected : This page"
-        text run at (0,18) width 175: "should have simple TEXT ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html12.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html12.html
deleted file mode 100644
index 6aa4caa..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html12.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a JPEG image and no HTML when the HTTP content-type is set to "text/html" .
- Expected : This page should have simple TEXT .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&switch=nohtml&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html13-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html13-expected.txt
deleted file mode 100644
index 78d0e64..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html13-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 784x36
-        text run at (0,0) width 651: "This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to \"text/html\" . "
-        text run at (651,0) width 133: "Expected : This page"
-        text run at (0,18) width 175: "should have simple TEXT ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html13.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html13.html
deleted file mode 100644
index 1705338..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html13.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a simple TEXT and no HTML when the HTTP content-type is set to "text/html" .
- Expected : This page should have simple TEXT .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&switch=nohtml&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html2-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html2-expected.txt
deleted file mode 100644
index 20897b1..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html2-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 769x36
-        text run at (0,0) width 670: "This tests loading of a HTML page with a BMP image when the HTTP content-type is set to \"text/html\" . "
-        text run at (670,0) width 99: "Expected : This"
-        text run at (0,18) width 363: "page should have been RENDERED INCORRECTLY ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html2.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html2.html
deleted file mode 100644
index 54bee82..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a BMP image when the HTTP content-type is set to "text/html" .
- Expected : This page should have been RENDERED INCORRECTLY .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&tag=img&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html3-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html3-expected.txt
deleted file mode 100644
index 70e04fb..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html3-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 759x36
-        text run at (0,0) width 660: "This tests loading of a HTML page with a TIF image when the HTTP content-type is set to \"text/html\" . "
-        text run at (660,0) width 99: "Expected : This"
-        text run at (0,18) width 363: "page should have been RENDERED INCORRECTLY ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html3.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html3.html
deleted file mode 100644
index 379c180..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html3.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a TIF image when the HTTP content-type is set to "text/html" .
- Expected : This page should have been RENDERED INCORRECTLY .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&tag=img&content=type_tif.tif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html4-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html4-expected.txt
deleted file mode 100644
index d97597e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html4-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 768x36
-        text run at (0,0) width 669: "This tests loading of a HTML page with a PNG image when the HTTP content-type is set to \"text/html\" . "
-        text run at (669,0) width 99: "Expected : This"
-        text run at (0,18) width 346: "page should have been RENDERED CORRECTLY ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html4.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html4.html
deleted file mode 100644
index a15cfec5..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html4.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a PNG image when the HTTP content-type is set to "text/html" .
- Expected : This page should have been RENDERED CORRECTLY .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&tag=img&content=type_png.png";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html5-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html5-expected.txt
deleted file mode 100644
index 49a8cf6..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html5-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 772x36
-        text run at (0,0) width 673: "This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to \"text/html\" . "
-        text run at (673,0) width 99: "Expected : This"
-        text run at (0,18) width 346: "page should have been RENDERED CORRECTLY ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html5.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html5.html
deleted file mode 100644
index bac04a2..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html5.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page with a JPEG image when the HTTP content-type is set to "text/html" .
- Expected : This page should have been RENDERED CORRECTLY .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&tag=img&content=type_jpg.jpg";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html6-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html6-expected.txt
deleted file mode 100644
index 8d92cee..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html6-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 760x36
-        text run at (0,0) width 547: "This tests loading of a HTML page when the HTTP content-type is set to \"text/html\" . "
-        text run at (547,0) width 213: "Expected : This page should have"
-        text run at (0,18) width 249: "been RENDERED INCORRECTLY ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html6.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html6.html
deleted file mode 100644
index d54e484..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html6.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a HTML page when the HTTP content-type is set to "text/html" .
- Expected : This page should have been RENDERED INCORRECTLY .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&tag=img&content=type_txt.txt";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html7-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html7-expected.txt
deleted file mode 100644
index cef90b2..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html7-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 774x36
-        text run at (0,0) width 707: "This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to \"text/html\" . "
-        text run at (707,0) width 67: "Expected :"
-        text run at (0,18) width 378: "This page should have been RENDERED CORRECTLY ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html7.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html7.html
deleted file mode 100644
index d437e85..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html7.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a an HTML page with a FLASH object when the HTTP content-type is set to "text/html" .
- Expected : This page should have been RENDERED CORRECTLY .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&tag=embed&content=type_swf.swf";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html8-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html8-expected.txt
deleted file mode 100644
index 1b96068b..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html8-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 765x36
-        text run at (0,0) width 632: "This tests loading of a GIF image and no HTML when the HTTP content-type is set to \"text/html\" . "
-        text run at (632,0) width 133: "Expected : This page"
-        text run at (0,18) width 175: "should have simple TEXT ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html8.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html8.html
deleted file mode 100644
index 0870896..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html8.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a GIF image and no HTML when the HTTP content-type is set to "text/html" .
- Expected : This page should have simple TEXT .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&switch=nohtml&content=type_gif.gif";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html9-expected.txt b/webkit/data/layout_tests/chrome/http/mime/main_text_html9-expected.txt
deleted file mode 100644
index 3eeea6d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html9-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 773x36
-        text run at (0,0) width 640: "This tests loading of a BMP image and no HTML when the HTTP content-type is set to \"text/html\" . "
-        text run at (640,0) width 133: "Expected : This page"
-        text run at (0,18) width 175: "should have simple TEXT ."
diff --git a/webkit/data/layout_tests/chrome/http/mime/main_text_html9.html b/webkit/data/layout_tests/chrome/http/mime/main_text_html9.html
deleted file mode 100644
index 1515a89..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/main_text_html9.html
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests loading of a BMP image and no HTML when the HTTP content-type is set to "text/html" .
- Expected : This page should have simple TEXT .
-
-<script>
-  window.location="resources/getpage.pl?type=text/html&switch=nohtml&content=type_bmp.bmp";
-</script>
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/getpage.pl b/webkit/data/layout_tests/chrome/http/mime/resources/getpage.pl
deleted file mode 100644
index bfeafd2..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/getpage.pl
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/perl -w
-# 
-# Copyright 2007 Google Inc.
-# All Rights Reserved.
-# Author: preethamr@google.com (Preetham Raghunanda)
-# 
-# Generates a html file using the URL query parameters that will be used to
-# test MIME type handling.
-
-
-use strict;
-use CGI qw(:standard);
-
-# Variable used in the script
-my $query = new CGI;
-my $type = "";
-my $html_tag = "";
-my $content = "";
-my $switch = "";
-
-
-# Check if the URL has query parameters.
-# If it does, obtain their values.
-if ($query->param()) {
-  $type = $query->param('type');
-  if ( $type eq "NULL") {
-    $type = "";
-  }
-  $html_tag = $query->param('tag');
-  $content = $query->param('content');
-  $switch = $query->param('switch');
-    print $type;
-}
-
-# print HTTP header with the current content-type
-&print_header("$type");
-
-# do not generate an HTML if 'nohtml' switch is used
-if($switch eq "nohtml") {
-  &print_file("$content");
-  exit;
-}
-
-# Generate the HTML using the URL query parameters
-print "<HTML><HEAD>";
-
-if($type ne "") {
-  print "<meta http-equiv=\"content-type\" content=\"$type\">";
-}
-
-print "<TITLE> Content-type : $type</TITLE>";
-print "<BODY contenteditable>";
-print "Rendered HTML successfully<br>";
-
-# Add embed or image tag
-if ($html_tag eq "embed") {
-  print "<$html_tag src=\"$content\">";
-  print "<NOEMBED> Your browser does not support embedded objects. </NOEMBED> ";
-  print "</$html_tag>";
-}elsif ( $html_tag ) {
-  print "<$html_tag alt=\"ERROR : Image not rendered.\" src=\"$content\" />";
-}
-
-# Make sure to dumpAsText when run in the test controller
-print <<SCRIPT;
-<script>
-  if(window.layoutTestController)    
-    layoutTestController.dumpAsText();
-</script>
-SCRIPT
-
-print "</BODY>\n</HTML>";
-
-# print_header()
-#   Generate the HTTP header with no-cache for this page.
-#   HTTP content-type is the only parameter to this subroutine.
-sub print_header()
-{
-  print "Status: 200 OK\r\n";
-
-  if($_[0] ne "") {
-    print "Content-type: $_[0]\r\n";
-  }
-
-  print "Cache-Control: no-cache\r\n";
-  print "\r\n";
-}
-
-# print_file()
-#   Prints the specified file on to the output stream.
-#   Path of the file is the only parameter for this subroutine.
-sub print_file()
-{
-  my $infile = $_[0];
-  open IN, "< $infile" or die "ERROR: Content not available.";
-  print <IN>;
-  close IN;
-}
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/html_type_gif.gif b/webkit/data/layout_tests/chrome/http/mime/resources/html_type_gif.gif
deleted file mode 100644
index 2d6e187..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/html_type_gif.gif
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/smokey.gif b/webkit/data/layout_tests/chrome/http/mime/resources/smokey.gif
deleted file mode 100644
index 46c7e4e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/smokey.gif
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_bmp.bmp b/webkit/data/layout_tests/chrome/http/mime/resources/type_bmp.bmp
deleted file mode 100644
index c07cdc0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_bmp.bmp
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_bmp16.bmp b/webkit/data/layout_tests/chrome/http/mime/resources/type_bmp16.bmp
deleted file mode 100644
index 5bb0d11..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_bmp16.bmp
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_bmp256.bmp b/webkit/data/layout_tests/chrome/http/mime/resources/type_bmp256.bmp
deleted file mode 100644
index 1e69e1d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_bmp256.bmp
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_bmpmono.bmp b/webkit/data/layout_tests/chrome/http/mime/resources/type_bmpmono.bmp
deleted file mode 100644
index 143679c..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_bmpmono.bmp
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_dib.dib b/webkit/data/layout_tests/chrome/http/mime/resources/type_dib.dib
deleted file mode 100644
index c07cdc0..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_dib.dib
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_doc.doc b/webkit/data/layout_tests/chrome/http/mime/resources/type_doc.doc
deleted file mode 100644
index 7c5b478..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_doc.doc
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_gif.gif b/webkit/data/layout_tests/chrome/http/mime/resources/type_gif.gif
deleted file mode 100644
index 8cf8442..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_gif.gif
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_jfif.jfif b/webkit/data/layout_tests/chrome/http/mime/resources/type_jfif.jfif
deleted file mode 100644
index c85db6e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_jfif.jfif
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_jpe.jpe b/webkit/data/layout_tests/chrome/http/mime/resources/type_jpe.jpe
deleted file mode 100644
index c799d16..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_jpe.jpe
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_jpeg.jpeg b/webkit/data/layout_tests/chrome/http/mime/resources/type_jpeg.jpeg
deleted file mode 100644
index 21c8dde..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_jpeg.jpeg
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_jpg.jpg b/webkit/data/layout_tests/chrome/http/mime/resources/type_jpg.jpg
deleted file mode 100644
index 7d5916e..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_jpg.jpg
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_jpged.jpeg b/webkit/data/layout_tests/chrome/http/mime/resources/type_jpged.jpeg
deleted file mode 100644
index a610257..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_jpged.jpeg
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_pdf.pdf b/webkit/data/layout_tests/chrome/http/mime/resources/type_pdf.pdf
deleted file mode 100644
index 4e827df..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_pdf.pdf
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_png.png b/webkit/data/layout_tests/chrome/http/mime/resources/type_png.png
deleted file mode 100644
index 8d1307d..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_png.png
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_swf.swf b/webkit/data/layout_tests/chrome/http/mime/resources/type_swf.swf
deleted file mode 100644
index 54170c4..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_swf.swf
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_tif.tif b/webkit/data/layout_tests/chrome/http/mime/resources/type_tif.tif
deleted file mode 100644
index 92e390f..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_tif.tif
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_tiff.tiff b/webkit/data/layout_tests/chrome/http/mime/resources/type_tiff.tiff
deleted file mode 100644
index 7a47734..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_tiff.tiff
+++ /dev/null
diff --git a/webkit/data/layout_tests/chrome/http/mime/resources/type_txt.txt b/webkit/data/layout_tests/chrome/http/mime/resources/type_txt.txt
deleted file mode 100644
index 98c4fa9..0000000
--- a/webkit/data/layout_tests/chrome/http/mime/resources/type_txt.txt
+++ /dev/null
@@ -1 +0,0 @@
-MIME type test
\ No newline at end of file
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index be04b8e..783c003 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -654,13 +654,6 @@ BUG24208 LINUX MAC : LayoutTests/http/tests/navigation/post-goback1.html = FAIL
 // controls are rare on the web, defer this fix.
 BUG21118 WIN LINUX : LayoutTests/fast/forms/box-shadow-override.html = FAIL
 
-// These tests are not valid: the so-called expected results are not known to
-// be correct.
-// TODO(ojan): They are *our* tests.
-// It seems silly to skip our own tests when we can change/delete them.
-// I'm marking them as deferred for now, but we should do something with them.
-BUG24192 SKIP : chrome/http/mime = PASS
-
 // These tests all depend on SessionStorage events which are not yet supported.
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/iframe-events.html = TIMEOUT
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/simple-events.html = FAIL