iOS: Add the Page Info password/credit card string for HTTP pages.

ios/chrome/browser/ui/omnibox/page_info_model.cc

 // Copyright (c) 2012 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 "ios/chrome/browser/ui/omnibox/page_info_model.h"
 
 #include <stdint.h>
 
 #include <string>
 
@@ skipping 113 matching lines @@
       description +=
           base::UTF8ToUTF16("\n\n") +
           l10n_util::GetStringUTF16(
               IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM);
     }
   } else {
     // HTTP or HTTPS with errors (not warnings).
     description.assign(l10n_util::GetStringUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY));
     icon_id = ssl.security_style == web::SECURITY_STYLE_UNAUTHENTICATED
-                  ? ICON_NONE
+                  ? ICON_STATE_INFO
                   : ICON_STATE_ERROR;
 
     const base::string16 bullet = base::UTF8ToUTF16("\n • ");
     std::vector<ssl_errors::ErrorInfo> errors;
     ssl_errors::ErrorInfo::GetErrorsForCertStatus(
         ssl.certificate, ssl.cert_status, url, &errors);
     for (size_t i = 0; i < errors.size(); ++i) {
       description += bullet;
       description += errors[i].short_description();
     }
 
     if (ssl.cert_status & net::CERT_STATUS_NON_UNIQUE_NAME) {
       description += base::ASCIIToUTF16("\n\n");
       description +=
           l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_NON_UNIQUE_NAME);
     }
   }
   sections_.push_back(SectionInfo(icon_id, headline, description,
                                   SECTION_INFO_IDENTITY,
                                   BUTTON_SHOW_SECURITY_HELP));
 
   // Connection section.
   icon_id = ICON_STATE_OK;
   headline.clear();
   description.clear();
   if (!ssl.certificate) {
     // Not HTTPS.
     icon_id = ssl.security_style == web::SECURITY_STYLE_UNAUTHENTICATED
-                  ? ICON_NONE
+                  ? ICON_STATE_INFO
                   : ICON_STATE_ERROR;
-    description.assign(l10n_util::GetStringFUTF16(
-        IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
-        subject_name));
+    description.assign(
+        l10n_util::GetStringUTF16(IDS_PAGEINFO_NOT_SECURE_SUMMARY));
+    description += base::ASCIIToUTF16("\n\n");
+    description += l10n_util::GetStringUTF16(IDS_PAGEINFO_NOT_SECURE_DETAILS);
   } else if (ssl.security_bits < 0) {
     if (ssl.content_status == web::SSLStatus::DISPLAYED_INSECURE_CONTENT) {
       DCHECK(description.empty());
       // For WKWebView security_bits flag is always -1, and description is empty
       // because ciphersuite is unknown. On iOS9 WKWebView blocks active
       // mixed content, so warning should be about page look, not about page
       // behavior.
       icon_id = ICON_NONE;
       description.assign(l10n_util::GetStringUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING));
@@ skipping 109 matching lines @@
     case ICON_STATE_OFFLINE_PAGE:
       return &rb.GetNativeImageNamed(IDR_IOS_OMNIBOX_OFFLINE);
   }
 }
 
 base::string16 PageInfoModel::GetCertificateLabel() const {
   return certificate_label_;
 }
 
 PageInfoModel::PageInfoModel() : observer_(NULL) {}