From c84a0ff26a32d0a7d8966699cef72b5220e42ae5 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 2 May 2015 14:08:47 +0100
Subject: Revert "Avoid race comditions in background completer, change id
 handling."

This reverts commit 02ca5eafb6aca5a9a09b3b592be76d3b834ccde6.

This is breaking pre-population of the vomnibar in tabs mode.  It's
harmless to remove it.
---
 pages/vomnibar.coffee | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/vomnibar.coffee b/pages/vomnibar.coffee
index f8ed0c78..260b163f 100644
--- a/pages/vomnibar.coffee
+++ b/pages/vomnibar.coffee
@@ -219,9 +219,10 @@ class BackgroundCompleter
     chrome.runtime.sendMessage({ handler: "refreshCompleter", name: @name })
 
   filter: (query, callback) ->
+    id = BackgroundCompleter.messageId += 1
     @filterPort.onMessage.addListener (msg) =>
       @filterPort.onMessage.removeListener(arguments.callee)
-      if msg.id == BackgroundCompleter.messageId
+      if id == BackgroundCompleter.messageId
         # The result objects coming from the background page will be of the form:
         #   { html: "", type: "", url: "" }
         # type will be one of [tab, bookmark, history, domain].
@@ -234,7 +235,7 @@ class BackgroundCompleter
           result
         callback(results)
 
-    @filterPort.postMessage({ id: ++BackgroundCompleter.messageId, name: @name, query: query })
+    @filterPort.postMessage({ id: id, name: @name, query: query })
 
 extend BackgroundCompleter,
   #
-- 
cgit v1.2.3