From 9d84ddc298cae2251a617fa8ccf75ebc03851d99 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Wed, 2 Aug 2017 15:42:48 +0100
Subject: [PATCH] Bug 1386658 - Update follow-on search add-on to 0.9.2 -
 additional domains and logging fix. r=past

--HG--
extra : rebase_source : 0bef7ef9d4ead07db82eec081b3ca37ef7fb704f
---
 browser/extensions/followonsearch/bootstrap.js                | 4 ++--
 .../extensions/followonsearch/content/followonsearch-fs.js    | 2 +-
 browser/extensions/followonsearch/install.rdf                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/extensions/followonsearch/bootstrap.js b/browser/extensions/followonsearch/bootstrap.js
index 5201a103e6a7..559d924a3d84 100644
--- a/browser/extensions/followonsearch/bootstrap.js
+++ b/browser/extensions/followonsearch/bootstrap.js
@@ -47,7 +47,7 @@ function log(message) {
  */
 function handleSaveTelemetryMsg(message) {
   if (message.name != kSaveTelemetryMsg) {
-    throw new Error(`Unexpected message received: ${kSaveTelemetryMsg}`);
+    throw new Error(`Unexpected message received: ${message.name}`);
   }
 
   let info = message.data;
@@ -63,7 +63,7 @@ function handleSaveTelemetryMsg(message) {
 }
 
 /**
- * Activites recording of telemetry if it isn't already activated.
+ * Activates recording of telemetry if it isn't already activated.
  */
 function activateTelemetry() {
   if (gTelemetryActivated) {
diff --git a/browser/extensions/followonsearch/content/followonsearch-fs.js b/browser/extensions/followonsearch/content/followonsearch-fs.js
index eccb55839704..50dd2e536f74 100644
--- a/browser/extensions/followonsearch/content/followonsearch-fs.js
+++ b/browser/extensions/followonsearch/content/followonsearch-fs.js
@@ -35,7 +35,7 @@ let searchDomains = [{
   // The Yahoo domains to watch for.
   "domains": [
     "search.yahoo.com", "ca.search.yahoo.com", "hk.search.yahoo.com",
-    "tw.search.yahoo.com"
+    "tw.search.yahoo.com", "mozilla.search.yahoo.com", "us.search.yahoo.com"
   ],
   "search": "p",
   "followOnSearch": "fr2",
diff --git a/browser/extensions/followonsearch/install.rdf b/browser/extensions/followonsearch/install.rdf
index e77d9788dde6..ed2c28efde1e 100644
--- a/browser/extensions/followonsearch/install.rdf
+++ b/browser/extensions/followonsearch/install.rdf
@@ -7,7 +7,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>followonsearch@mozilla.com</em:id>
     <em:name>Follow-on Search Telemetry</em:name>
-    <em:version>0.9.1</em:version>
+    <em:version>0.9.2</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>