From 0ea3b46b0712fbcf233064465bacce9d07642b5f Mon Sep 17 00:00:00 2001
From: Mike Connor <mconnor@mozilla.com>
Date: Mon, 2 Feb 2015 13:47:00 -0500
Subject: [PATCH] bug 1126511 - update Yahoo search plugins to use per-access
 point tags for better reporting/analysis, Fennec portion, r=margaret/mfinkle

--HG--
extra : rebase_source : 830e957e03c6035e715bd29ebb99f6de38aa49af
---
 mobile/locales/en-US/searchplugins/yahoo.xml | 37 ++++++++++++++------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/mobile/locales/en-US/searchplugins/yahoo.xml b/mobile/locales/en-US/searchplugins/yahoo.xml
index f6ac0aa30782..cceee8748034 100644
--- a/mobile/locales/en-US/searchplugins/yahoo.xml
+++ b/mobile/locales/en-US/searchplugins/yahoo.xml
@@ -13,16 +13,33 @@
   <Param name="command" value="{searchTerms}" />
   <MozParam name="nresults" condition="pref" pref="maxSuggestions" />
 </Url>
-<Url type="text/html" method="GET" template="https://search.yahoo.com/search">
-  <Param name="p" value="{searchTerms}" />
-  <Param name="ei" value="UTF-8" />
-  <Param name="fr" value="mozmob1" />
+<!-- phone search -->
+<Url type="text/html" method="GET" template="https://search.yahoo.com/yhs/search" rel="searchform">
+  <Param name="ei"     value="UTF-8" />
+  <Param name="hspart" value="mozilla" />
+  <Param name="hsimp"  value="yhsm-002" />
+  <Param name="p"  value="{searchTerms}" />
 </Url>
-<!-- Search activity -->
-<Url type="text/html" method="GET" rel="mobile" template="https://search.yahoo.com/search">
-  <Param name="p" value="{searchTerms}" />
-  <Param name="ei" value="UTF-8" />
-  <Param name="fr" value="mozmob2" />
+<!-- tablet search -->
+<Url type="application/x-moz-tabletsearch" method="GET" template="https://search.yahoo.com/yhs/search">
+  <Param name="ei"     value="UTF-8" />
+  <Param name="hspart" value="mozilla" />
+  <Param name="hsimp"  value="yhst-002" />
+  <Param name="p"  value="{searchTerms}" />
+</Url>
+<!-- phone Search activity -->
+<Url type="text/html" method="GET" rel="mobile" template="https://search.yahoo.com/yhs/search">
+  <Param name="ei"     value="UTF-8" />
+  <Param name="hspart" value="mozilla" />
+  <Param name="hsimp"  value="yhsm-001" />
+  <Param name="p"  value="{searchTerms}" />
+</Url>
+<!-- Tablet Search activity -->
+<Url type="application/x-moz-tabletsearch" method="GET" 
+     rel="mobile" template="https://search.yahoo.com/yhs/search">
+  <Param name="ei"     value="UTF-8" />
+  <Param name="hspart" value="mozilla" />
+  <Param name="hsimp"  value="yhst-002" />
+  <Param name="p"  value="{searchTerms}" />
 </Url>
-<SearchForm>https://search.yahoo.com/</SearchForm>
 </SearchPlugin>