Backed out changesets da8594f6e177 and 658ba2f4d879 (bug 1126511) for mochitest-bc failures.

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2015-02-02 16:58:12 -05:00
parent 7e9cd48b82
commit 2da1a88931
2 changed files with 12 additions and 33 deletions

View File

@ -17,13 +17,9 @@
</Url>
<Url type="text/html" method="GET" template="https://search.yahoo.com/yhs/search"
resultdomain="yahoo.com" rel="searchform">
<Param name="p" value="{searchTerms}"/>
<Param name="ei" value="UTF-8"/>
<Param name="hspart" value="mozilla"/>
<MozParam name="hsimp" condition="purpose" purpose="searchbar" value="yhs-001"/>
<MozParam name="hsimp" condition="purpose" purpose="keyword" value="yhs-002"/>
<MozParam name="hsimp" condition="purpose" purpose="homepage" value="yhs-003"/>
<MozParam name="hsimp" condition="purpose" purpose="newtab" value="yhs-004"/>
<MozParam name="hsimp" condition="purpose" purpose="contextmenu" value="yhs-005"/>
<Param name="p" value="{searchTerms}"/>
<Param name="hsimp" value="yhs-001"/>
</Url>
</SearchPlugin>

View File

@ -13,33 +13,16 @@
<Param name="command" value="{searchTerms}" />
<MozParam name="nresults" condition="pref" pref="maxSuggestions" />
</Url>
<!-- 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 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" />
</Url>
<!-- 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}" />
<!-- 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" />
</Url>
<SearchForm>https://search.yahoo.com/</SearchForm>
</SearchPlugin>