From 73c651465d1395e23daae01b0ae2a3df5b24a789 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Tue, 2 Jun 2015 17:19:24 +0100
Subject: Guard against chrome being undefined in the HUD iframe

---
 lib/find_mode_history.coffee   | 7 +++++--
 manifest.json                  | 1 +
 tests/dom_tests/dom_tests.html | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/find_mode_history.coffee b/lib/find_mode_history.coffee
index dd21a2b9..ff660bd2 100644
--- a/lib/find_mode_history.coffee
+++ b/lib/find_mode_history.coffee
@@ -2,13 +2,16 @@
 # This implements find-mode query history (using the "findModeRawQueryList" setting) as a list of raw queries,
 # most recent first.
 FindModeHistory =
-  storage: chrome.storage.local
+  storage: chrome?.storage.local # Guard against chrome being undefined (in the HUD iframe).
   key: "findModeRawQueryList"
   max: 50
   rawQueryList: null
-  isIncognitoMode: chrome.extension.inIncognitoContext
 
   init: ->
+    @isIncognitoMode = chrome?.extension.inIncognitoContext
+
+    return unless @isIncognitoMode? # chrome is undefined in the HUD iframe during tests, so we do nothing.
+
     unless @rawQueryList
       @rawQueryList = [] # Prevent repeated initialization.
       @key = "findModeRawQueryListIncognito" if @isIncognitoMode
diff --git a/manifest.json b/manifest.json
index 80aca4c5..4ef5edfe 100644
--- a/manifest.json
+++ b/manifest.json
@@ -42,6 +42,7 @@
              "lib/handler_stack.js",
              "lib/clipboard.js",
              "lib/settings.js",
+             "lib/find_mode_history.js",
              "content_scripts/ui_component.js",
              "content_scripts/link_hints.js",
              "content_scripts/vomnibar.js",
diff --git a/tests/dom_tests/dom_tests.html b/tests/dom_tests/dom_tests.html
index f7cc430d..25c5f8ba 100644
--- a/tests/dom_tests/dom_tests.html
+++ b/tests/dom_tests/dom_tests.html
@@ -36,6 +36,7 @@
     <script type="text/javascript" src="../../lib/handler_stack.js"></script>
     <script type="text/javascript" src="../../lib/clipboard.js"></script>
     <script type="text/javascript" src="../../lib/settings.js"></script>
+    <script type="text/javascript" src="../../lib/find_mode_history.js"></script>
     <script type="text/javascript" src="../../content_scripts/ui_component.js"></script>
     <script type="text/javascript" src="../../content_scripts/link_hints.js"></script>
     <script type="text/javascript" src="../../content_scripts/vomnibar.js"></script>
-- 
cgit v1.2.3