Remove obsolete SHA-1 UX elements

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 101 matching lines @@
         headline.assign(subject_name);
       base::string16 issuer_name(
           base::UTF8ToUTF16(ssl.certificate->issuer().GetDisplayName()));
       if (issuer_name.empty()) {
         issuer_name.assign(l10n_util::GetStringUTF16(
             IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));
       }
       description.assign(l10n_util::GetStringFUTF16(
           IDS_IOS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY, issuer_name));
     }
-    // The date after which no new SHA-1 certificates may be issued.
-    // 2016-01-01 00:00:00 UTC
-    // WARNING: This value must be kept in sync with WebsiteSettings::Init() in
-    // chrome/browser/ui/website_settings/website_settings.cc.
-    static const int64_t kJanuary2016 = INT64_C(13096080000000000);
-    static const int64_t kJanuary2017 = INT64_C(13127702400000000);
-    if ((ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT) &&
-        ssl.certificate->valid_expiry() >=
-            base::Time::FromInternalValue(kJanuary2016)) {
+    if (ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT) {
       icon_id = ICON_STATE_INFO;
-      if (ssl.certificate->valid_expiry() >=
-          base::Time::FromInternalValue(kJanuary2017)) {
-        description +=
-            base::UTF8ToUTF16("\n\n") +
-            l10n_util::GetStringUTF16(
-                IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR);
-      } else {
-        description +=
-            base::UTF8ToUTF16("\n\n") +
-            l10n_util::GetStringUTF16(
-                IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM_MINOR);
-      }
+      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_ERROR;
 
     const base::string16 bullet = base::UTF8ToUTF16("\n • ");
@@ skipping 149 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) {}