Bug 1340443 Fix reading from brand bundle and add a test r=florian

MozReview-Commit-ID: RGHXg0hMgJ

--HG--
extra : rebase_source : 9ae7f0eaa02430c1d556378c813c81ee42cda648

browser/base/content/test/general/browser_extension_permissions.js

@@ -62,7 +62,7 @@ function checkNotification(panel, filename) {
     ok(icon.endsWith("/icon.png"), "Icon is icon.png inside a jar");
 
     is(header.getAttribute("hidden"), "", "Permission list header is visible");
-    is(ul.childElementCount, 4, "Permissions list has 4 entries");
+    is(ul.childElementCount, 5, "Permissions list has 5 entries");
     // Real checking of the contents here is deferred until bug 1316996 lands
   } else if (filename == NO_PERMS_XPI) {
     // This extension has no icon, it should have the default

browser/modules/ExtensionsUI.jsm

@@ -25,7 +25,7 @@ XPCOMUtils.defineLazyPreferenceGetter(this, "WEBEXT_PERMISSION_PROMPTS",
 const DEFAULT_EXTENSION_ICON = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
 
 const BROWSER_PROPERTIES = "chrome://browser/locale/browser.properties";
-const BRAND_PROPERTIES = "chrome://browser/locale/brand.properties";
+const BRAND_PROPERTIES = "chrome://branding/locale/brand.properties";
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";