From f036df8e474f5ad8824a37c68844e4b532d23e50 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Thu, 16 Jul 2015 13:34:40 -0700
Subject: [PATCH] Bug 1180827 - Get rid of a couple of setTimeouts/flaky test
 requests. r=MattN

---
 .../test_form_autocomplete_with_list.html     | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/toolkit/components/satchel/test/test_form_autocomplete_with_list.html b/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
index e206c2135f4..520a033dc55 100644
--- a/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
+++ b/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
@@ -429,30 +429,36 @@ function runTest() {
       // Filter with a letter in the middle of the word.
       synthesizeKey("i", {});
       synthesizeKey("n", {});
-      setTimeout(function() {
-        doKey("down");
-        doKey("return");
-        checkForm("final");
-        expectPopup();
-        restoreForm();
-        doKey("down");
-      }, 500);
+      waitForMenuChange(1);
       break;
 
     case 303:
+      // Continuation of test 302.
+      doKey("down");
+      doKey("return");
+      checkForm("final");
+      expectPopup();
+      restoreForm();
+      doKey("down");
+      break;
+
+    case 304:
       // Filter is disabled with mozNoFilter.
       input.setAttribute('mozNoFilter', 'true');
       synthesizeKey("f", {});
-      setTimeout(function() {
-        doKey("down");
-        doKey("return");
-        checkForm("Google");
-        input.removeAttribute('mozNoFilter');
-        testNum = 399;
-        expectPopup();
-        restoreForm();
-        doKey("down");
-      }, 500);
+      waitForMenuChange(3); // no change
+      break;
+
+    case 305:
+      // Continuation of test 304.
+      doKey("down");
+      doKey("return");
+      checkForm("Google");
+      input.removeAttribute('mozNoFilter');
+      testNum = 399;
+      expectPopup();
+      restoreForm();
+      doKey("down");
       break;
 
     case 400:
@@ -496,7 +502,6 @@ function startTest() {
 window.onload = startTest;
 
 SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
 </script>
 </pre>
 </body>