Bug 1497827 - Do not display EV labels instead of domains in site identity header r=johannh

Differential Revision: https://phabricator.services.mozilla.com/D18013

--HG--
extra : moz-landing-system : lando

browser/base/content/browser-siteIdentity.js

@@ -758,7 +758,7 @@ var gIdentityHandler = {
     // Fill in organization information if we have a valid EV certificate.
     if (this._isEV) {
       let iData = this.getIdentityData();
-      host = owner = iData.subjectOrg;
+      owner = iData.subjectOrg;
       verifier = this._identityIconLabels.tooltipText;
 
       // Build an appropriate supplemental block out of whatever location data we have

testing/firefox-ui/tests/functional/security/test_ev_certificate.py

@@ -49,11 +49,9 @@ class TestEVCertificate(PuppeteerMixin, MarionetteTestCase):
         # Check the idenity popup doorhanger
         self.assertEqual(self.identity_popup.element.get_attribute('connection'), 'secure-ev')
 
-        # For EV certificates no hostname but the organization name is shown
-        l10n_header = self.browser.localize_property('identity.headerWithHost')
-        l10n_header = l10n_header.replace('%S', cert['organization'])
-        self.assertEqual(self.identity_popup.view.main.header.get_property('textContent'),
-                         l10n_header)
+        # For EV certificates, the hostname is shown
+        self.assertRegexpMatches(self.identity_popup.view.main.header.get_property('textContent'),
+                                 '.*badssl\.com$')
 
         # Only the secure label is visible in the main view
         secure_label = self.identity_popup.view.main.secure_connection_label