Bug 532180: adjust search parameters for default plugins, r=mfinkle

--HG--
extra : rebase_source : 7d29ad8e7dc3ff2d5e15f61b4e8666c0a06bd47a

mobile/app/mobile.js

@@ -409,3 +409,7 @@ pref("ui.window", "#efebe7");
 pref("ui.windowtext", "#101010");
 pref("ui.windowframe", "#efebe7");
 
+#ifdef MOZ_OFFICIAL_BRANDING
+pref("browser.search.param.yahoo-fr", "moz35");
+pref("browser.search.param.yahoo-fr-cjkt", "moz35");
+#endif

mobile/locales/en-US/searchplugins/google.xml

@@ -10,7 +10,6 @@
   <Param name="aq" value="t"/>
   <!-- Dynamic parameters -->
   <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
-  <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
 </Url>
 <SearchForm>http://www.google.com/firefox</SearchForm>
 </SearchPlugin>