20 files changed, 10 insertions, 6 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-change-event-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event-expected.txt
index b6396025..b6396025 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-change-event-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-change-event.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event.html
index 2b0e1b9..b9599bb 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-change-event.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../js/resources/js-test-pre.js"></script>
 </head>
 <body>
 <input type="file" id="singleFile" name="upfile" onchange="singleFileSelected()" />
@@ -105,6 +105,6 @@ function dragFilesOntoInput(input, files) {
 
 var successfullyParsed = true;
 </script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../js/resources/js-test-post.js"></script>
 </body>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-direction.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-direction.html
index 5b6df85..5b6df85 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-direction.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-direction.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-disabled.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-disabled.html
index 42baaee..42baaee 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-disabled.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-disabled.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-hit-test-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test-expected.txt
index 915a226..915a226 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-hit-test-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-hit-test.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test.html
index 5b9ea13..5b9ea13 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-hit-test.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-reset-expected.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset-expected.html
index 4eea2bc..4eea2bc 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-reset-expected.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset-expected.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-reset.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset.html
index a547850..a547850 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-reset.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/get-file-upload-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload-expected.txt
index f0ae8b0..f0ae8b0 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/get-file-upload-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/get-file-upload.html b/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload.html
index 83e59cb..83e59cb 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/get-file-upload.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file-expected.html b/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file-expected.html
new file mode 100644
index 0000000..c50928d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file-expected.html
@@ -0,0 +1,3 @@
+<div style="line-height: 2em;">This tests that the whole file input control is hidden when visibility is set to hidden.</div>
+
+
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file.html b/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file.html
new file mode 100644
index 0000000..810b971
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file.html
@@ -0,0 +1,3 @@
+<div style="line-height: 2em;">This tests that the whole file input control is hidden when visibility is set to hidden.
+<input type="file" style="visibility: hidden"></div>
+
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-directory-upload-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload-expected.txt
index eeb91fa..eeb91fa 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-directory-upload-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-directory-upload.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload.html
index 683ded3..683ded3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-directory-upload.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-label-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label-expected.txt
index cb40a59..cb40a59 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-label-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-label.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label.html
index 0ed99fb..381dc84 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-label.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../js/resources/js-test-pre.js"></script>
 </head>
 <body>
 <input id="single_file" name="upfile" type="file" />
@@ -44,6 +44,6 @@ if (window.layoutTestController) {
 
 var successfullyParsed = true;
 </script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../js/resources/js-test-post.js"></script>
 </body>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-not-open-without-gesture-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture-expected.txt
index 892e199..892e199 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-not-open-without-gesture-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-not-open-without-gesture.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture.html
index 27cdec2..27cdec2 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-not-open-without-gesture.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-re-render.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-re-render.html
index 24de2b3..24de2b3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-re-render.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-re-render.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/hidden-input-file.html b/third_party/WebKit/LayoutTests/fast/forms/hidden-input-file.html
deleted file mode 100644
index b2a6c07..0000000
--- a/third_party/WebKit/LayoutTests/fast/forms/hidden-input-file.html
+++ /dev/null
@@ -1,2 +0,0 @@
-This tests that the whole file input control is hidden when visibility is set to hidden.
-<input type="file" style="visibility: hidden">