Add organization details to Page Info

This adds a new subsection under the security details section of the
Page Info bubble on Desktop showing the organization name and country
of the jurisdiction of incorporation on pages with EV certificates.

Bug: 969734
Change-Id: Ia9c89ae7065476bfc7ec01c9fb66c4810fa245bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1643755
Commit-Queue: Christopher Thompson <[email protected]>
Reviewed-by: Michael Wasserman <[email protected]>
Reviewed-by: Emily Stark <[email protected]>
Cr-Commit-Position: refs/heads/master@{#666886}
diff --git a/chrome/browser/ui/page_info/page_info.cc b/chrome/browser/ui/page_info/page_info.cc
index b6aee18..270d75c3 100644
--- a/chrome/browser/ui/page_info/page_info.cc
+++ b/chrome/browser/ui/page_info/page_info.cc
@@ -700,24 +700,10 @@
         // state is "if any".
         DCHECK(!certificate_->subject().locality_name.empty());
         DCHECK(!certificate_->subject().country_name.empty());
-        base::string16 locality;
-        if (!certificate_->subject().state_or_province_name.empty()) {
-          locality = l10n_util::GetStringFUTF16(
-              IDS_PAGE_INFO_ADDRESS,
-              UTF8ToUTF16(certificate_->subject().locality_name),
-              UTF8ToUTF16(certificate_->subject().state_or_province_name),
-              UTF8ToUTF16(certificate_->subject().country_name));
-        } else {
-          locality = l10n_util::GetStringFUTF16(
-              IDS_PAGE_INFO_PARTIAL_ADDRESS,
-              UTF8ToUTF16(certificate_->subject().locality_name),
-              UTF8ToUTF16(certificate_->subject().country_name));
-        }
-        DCHECK(!certificate_->subject().organization_names.empty());
         site_identity_details_.assign(l10n_util::GetStringFUTF16(
             IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_VERIFIED,
-            UTF8ToUTF16(certificate_->subject().organization_names[0]),
-            locality, UTF8ToUTF16(certificate_->issuer().GetDisplayName())));
+            organization_name_,
+            UTF8ToUTF16(certificate_->subject().country_name)));
       } else {
         // Non-EV OK HTTPS page.
         site_identity_status_ = SITE_IDENTITY_STATUS_CERT;