Prepare security bullets for Android: add issuer and change connection details.

components/security_state/content/content_utils.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/security_state/content/content_utils.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
@@ skipping 94 matching lines @@
     return;
   }
 
   std::vector<base::string16> description_replacements;
   int status = security_info.obsolete_ssl_status;
   int str_id;
 
   str_id = (status & net::OBSOLETE_SSL_MASK_PROTOCOL)
                ? IDS_SSL_AN_OBSOLETE_PROTOCOL
                : IDS_SSL_A_STRONG_PROTOCOL;
+  description_replacements.push_back(protocol_name);
   description_replacements.push_back(l10n_util::GetStringUTF16(str_id));
-  description_replacements.push_back(protocol_name);
 
   str_id = (status & net::OBSOLETE_SSL_MASK_KEY_EXCHANGE)
                ? IDS_SSL_AN_OBSOLETE_KEY_EXCHANGE
                : IDS_SSL_A_STRONG_KEY_EXCHANGE;
+  description_replacements.push_back(key_exchange_name);
   description_replacements.push_back(l10n_util::GetStringUTF16(str_id));
-  description_replacements.push_back(key_exchange_name);
 
   str_id = (status & net::OBSOLETE_SSL_MASK_CIPHER) ? IDS_SSL_AN_OBSOLETE_CIPHER
                                                     : IDS_SSL_A_STRONG_CIPHER;
+  description_replacements.push_back(cipher_name);
   description_replacements.push_back(l10n_util::GetStringUTF16(str_id));
-  description_replacements.push_back(cipher_name);
 
   security_style_explanations->info_explanations.push_back(
       content::SecurityStyleExplanation(
           l10n_util::GetStringUTF8(IDS_OBSOLETE_SSL_SUMMARY),
           base::UTF16ToUTF8(
               l10n_util::GetStringFUTF16(IDS_OBSOLETE_SSL_DESCRIPTION,
                                          description_replacements, nullptr))));
 }
 
 }  // namespace
@@ skipping 152 matching lines @@
         !!security_info.certificate);
 
     if (is_cert_status_minor_error) {
       security_style_explanations->neutral_explanations.push_back(explanation);
     } else {
       security_style_explanations->insecure_explanations.push_back(explanation);
     }
   } else {
     // If the certificate does not have errors and is not using SHA1, then add
     // an explanation that the certificate is valid.
+
+    base::string16 issuer_name;
+    if (security_info.certificate) {
+      // This results in the empty string if there is no relevant display name.
+      issuer_name = base::UTF8ToUTF16(
+          security_info.certificate->issuer().GetDisplayName());
+    } else {
+      issuer_name = base::string16();
+    }
+    if (issuer_name.empty()) {
+      issuer_name.assign(
+          l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));
+    }
+
     if (!security_info.sha1_in_chain) {
       security_style_explanations->secure_explanations.push_back(
           content::SecurityStyleExplanation(
               l10n_util::GetStringUTF8(IDS_VALID_SERVER_CERTIFICATE),
-              l10n_util::GetStringUTF8(
-                  IDS_VALID_SERVER_CERTIFICATE_DESCRIPTION),
+              l10n_util::GetStringFUTF8(
+                  IDS_VALID_SERVER_CERTIFICATE_DESCRIPTION, issuer_name),
               !!security_info.certificate));
     }
   }
 
   AddConnectionExplanation(security_info, security_style_explanations);
 
   security_style_explanations->pkp_bypassed = security_info.pkp_bypassed;
   if (security_info.pkp_bypassed) {
     security_style_explanations->info_explanations.push_back(
         content::SecurityStyleExplanation(
             l10n_util::GetStringUTF8(IDS_PRIVATE_KEY_PINNING_BYPASSED),
             l10n_util::GetStringUTF8(
                 IDS_PRIVATE_KEY_PINNING_BYPASSED_DESCRIPTION)));
   }
 
   return security_style;
 }
 
 }  // namespace security_state