From 4d0f4b4509715d2d96d8074d4479da4d1bbcd373 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Mon, 17 Jun 2013 12:18:31 +0100
Subject: [PATCH] Backed out changeset eff8e7fefffd (bug 883164) for breaking
 the test on Android

---
 .../test/forms/test_input_file_picker.html    | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/content/html/content/test/forms/test_input_file_picker.html b/content/html/content/test/forms/test_input_file_picker.html
index 3e73723ea10..63b4858307e 100644
--- a/content/html/content/test/forms/test_input_file_picker.html
+++ b/content/html/content/test/forms/test_input_file_picker.html
@@ -23,10 +23,10 @@
   <input id='h' type='file' accept="foo/baz,image/*,bogus/duh">
   <input id='i' type='file' accept="mime/type;parameter,video/*">
   <input id='j' type='file' accept="audio/*, audio/*, audio/*">
-  <input id='k' type="file" accept="image/gif,image/png">
-  <input id='l' type="file" accept="image/*,image/gif,image/png">
-  <input id='m' type="file" accept="image/gif,image/gif">
-  <input id='n' type="file" accept="">
+  <input id='k' type="file" accept="image/gif,image/png" />
+  <input id='l' type="file" accept="image/*,image/gif,image/png" />
+  <input id='m' type="file" accept="image/gif,image/gif" />
+  <input id='n' type="file" accept="" />
   <input id='z' type='file' accept="i/am,a,pathological,;,,,,test/case">
   <input id='hidden' hidden type='file'>
   <input id='untrusted-click' type='file'>
@@ -43,8 +43,6 @@
   <button id='button-click' onclick="document.getElementById('by-button').click();">foo</button>
   <button id='button-down' onclick="document.getElementById('by-button').click();">foo</button>
   <button id='button-up' onclick="document.getElementById('by-button').click();">foo</button>
-  <div id='div-click' onclick="document.getElementById('by-button').click();">foo</div>
-  <div id='div-click-on-demand' onclick="var i=document.createElement('input'); i.type='file'; i.click();">foo</div>
 </div>
 <pre id="test">
 <script type="application/javascript">
@@ -96,8 +94,6 @@ var testData = [["a", 1, MockFilePicker.filterImages, 1],
                 ["button-click", 0, undefined, 0],
                 ["button-down", 0, undefined, 0],
                 ["button-up", 0, undefined, 0],
-                ["div-click", 0, undefined, 0],
-                ["div-click-on-demand", 0, undefined, 0],
                ];
 
 var currentTest = 0;
@@ -158,9 +154,7 @@ function launchNextTest() {
     synthesizeMouse(document.getElementById(testData[currentTest][0]), 5, 5, {});
   } else if (testData[currentTest][0] == 'button-click' ||
              testData[currentTest][0] == 'button-down' ||
-             testData[currentTest][0] == 'button-up' ||
-             testData[currentTest][0] == 'div-click' ||
-             testData[currentTest][0] == 'div-click-on-demand') {
+             testData[currentTest][0] == 'button-up') {
     synthesizeMouseAtCenter(document.getElementById(testData[currentTest][0]), {});
   } else {
     document.getElementById(testData[currentTest][0]).click();
@@ -199,8 +193,7 @@ function runTests() {
          "File picker should show the correct filter index (" + testName + ")");
 
       if (++currentTest == testData.length) {
-        MockFilePicker.cleanup();
-        SimpleTest.finish();
+        setTimeout(testDisconnectedElement, 0);
       } else {
         launchNextTest();
       }
@@ -210,6 +203,20 @@ function runTests() {
   launchNextTest();
 }
 
+function testDisconnectedElement() {
+  MockFilePicker.shown = false;
+  MockFilePicker.showCallback = function(filepicker) {
+    ok(MockFilePicker.shown, "FilePicker should be open!");
+    MockFilePicker.shown = false;
+    MockFilePicker.cleanup();
+    SimpleTest.finish();
+  }
+  var f = document.createElement("input");
+  f.setAttribute("type", "file");
+  f.click();
+  ok(!MockFilePicker.shown, "FilePicker should open asynchronously!");
+}
+
 </script>
 </pre>
 </body>