From a9bef43543934f49510b0e0b3de198091cfa7985 Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Sat, 23 Nov 2013 09:08:26 +0100
Subject: [PATCH] Bug 930967 - Follow-up to fix mistake in test suite that lead
 to intermittent failures r=me

From 7531ffe0cfebf5296b063538922c12fb83bfb8f7 Mon Sep 17 00:00:00 2001
---
 browser/components/sessionstore/test/head.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/components/sessionstore/test/head.js b/browser/components/sessionstore/test/head.js
index 90f81bb64f8..c9f9bb0914e 100644
--- a/browser/components/sessionstore/test/head.js
+++ b/browser/components/sessionstore/test/head.js
@@ -191,20 +191,20 @@ function promiseContentMessage(browser, name, timeout = 1000) {
     mm.removeMessageListener(name, listener);
   }
 
-  let timeout = setTimeout(function () {
+  let timeoutID = setTimeout(function () {
     removeListener();
     deferred.resolve(false);
   }, timeout);
 
   function listener(msg) {
     removeListener();
-    clearTimeout(timeout);
+    clearTimeout(timeoutID);
     deferred.resolve(msg);
   }
 
   registerCleanupFunction(function() {
     removeListener();
-    clearTimeout(timeout);
+    clearTimeout(timeoutID);
   });
 
   mm.addMessageListener(name, listener);