Bug 1393848 - Move search-plugin resource entry to browser's content jar.mn. r=Pike

MozReview-Commit-ID: JJD222TkR8a

--HG--
extra : rebase_source : 9e6fb7e165fda08b497849ec660c802cf2311449

browser/base/jar.mn

@@ -175,7 +175,8 @@ browser.jar:
 
 % override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml
 
-# L10n resource overrides.
+# L10n resources and overrides.
 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
+% resource search-plugins chrome://browser/locale/searchplugins/

browser/locales/jar.mn

@@ -3,8 +3,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Note: All overrides should go to browser/base/jar.mn in order to avoid
-# having to create the same override entry for each locale.
+# Note: This file should only contain locale entries. All
+# override and resource entries should go to browser/base/jar.mn to avoid
+# having to create the same entry for each locale.
 
 @AB_CD@.jar:
 % locale browser @AB_CD@ %locale/browser/
@@ -102,7 +103,6 @@
     locale/browser/preferences/translation.dtd        (%chrome/browser/preferences/translation.dtd)
     locale/browser/syncBrand.dtd                (%chrome/browser/syncBrand.dtd)
     locale/browser/syncSetup.properties         (%chrome/browser/syncSetup.properties)
-% resource search-plugins chrome://browser/locale/searchplugins/
 #if BUILD_FASTER
     locale/browser/searchplugins/               (searchplugins/*.xml)
     locale/browser/searchplugins/list.json      (search/list.json)