From a91dd88b6317e661808e689cafb1c2c3bd98bfb0 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Wed, 23 Feb 2011 18:11:47 +0100
Subject: [PATCH] Bug 636139 - browser_scrollbar.js failure [r=mfinkle]

---
 mobile/chrome/tests/browser_scrollbar.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/chrome/tests/browser_scrollbar.js b/mobile/chrome/tests/browser_scrollbar.js
index 9fcb4088e36b..4d45c82a7101 100644
--- a/mobile/chrome/tests/browser_scrollbar.js
+++ b/mobile/chrome/tests/browser_scrollbar.js
@@ -25,7 +25,10 @@ function waitForPageShow(aPageURL, aCallback) {
   messageManager.addMessageListener("pageshow", function(aMessage) {
     if (aMessage.target.currentURI.spec == aPageURL) {
       messageManager.removeMessageListener("pageshow", arguments.callee);
-      setTimeout(function() { aCallback(); }, 0);
+      messageManager.addMessageListener("MozScrolledAreaChanged", function(aMessage) {
+        messageManager.removeMessageListener("MozScrolledAreaChanged", arguments.callee);
+        aCallback();
+      });
     }
   });
 };
@@ -91,6 +94,7 @@ gTests.push({
       setTimeout(function() {
         for (let iTab=0; iTab<gOpenedTabs.length; iTab++)
           Browser.closeTab(gOpenedTabs[iTab]);
+        Browser.hideSidebars();
       }, 0);
     }, false);
     runNextTest();