Remove the SHA-1 deprecation field trial code; the plan is live

chrome/browser/ui/toolbar/toolbar_model_impl.cc

 // Copyright 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 "chrome/browser/ui/toolbar/toolbar_model_impl.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 33 matching lines @@
 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
 #endif
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::SSLStatus;
 using content::WebContents;
 
 namespace {
 
-// Converts a SHA-1 field trial group into the appropriate SecurityLevel.
-bool GetSecurityLevelForFieldTrialGroup(const std::string& group,
-                                        ToolbarModel::SecurityLevel* level) {
-  if (group == "Error")
-    *level = ToolbarModel::SECURITY_ERROR;
-  else if (group == "Warning")
-    *level = ToolbarModel::SECURITY_WARNING;
-  else if (group == "HTTP")
-    *level = ToolbarModel::NONE;
-  else
-    return false;
-  return true;
-}
-
 ToolbarModel::SecurityLevel GetSecurityLevelForNonSecureFieldTrial() {
   std::string choice = base::CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::kMarkNonSecureAs);
   if (choice == switches::kMarkNonSecureAsNeutral)
     return ToolbarModel::NONE;
   if (choice == switches::kMarkNonSecureAsDubious)
     return ToolbarModel::SECURITY_WARNING;
   if (choice == switches::kMarkNonSecureAsNonSecure)
     return ToolbarModel::SECURITY_ERROR;
 
@@ skipping 51 matching lines @@
         return SECURITY_POLICY_WARNING;
 #endif
       if (!!(ssl.content_status & SSLStatus::DISPLAYED_INSECURE_CONTENT))
         return SECURITY_WARNING;
       scoped_refptr<net::X509Certificate> cert;
       if (content::CertStore::GetInstance()->RetrieveCert(ssl.cert_id, &cert) &&
           (ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT)) {
         // The internal representation of the dates for UI treatment of SHA-1.
         // See http://crbug.com/401365 for details
         static const int64_t kJanuary2017 = INT64_C(13127702400000000);
-        static const int64_t kJune2016 = INT64_C(13109213000000000);
         // kJanuary2016 needs to be kept in sync with
         // ToolbarModelAndroid::IsDeprecatedSHA1Present().
         static const int64_t kJanuary2016 = INT64_C(13096080000000000);
-
-        ToolbarModel::SecurityLevel security_level = NONE;
-        // Gated behind a field trial, so that it is possible to adjust the
-        // UI treatment (to be more or less severe, as necessary) over the
-        // course of multiple releases.
-        // See http://crbug.com/401365 for the timeline, with the end state
-        // being that > kJanuary2017 = Error, and > kJanuary2016 =
-        // Warning, and kJune2016 disappearing entirely.
         if (cert->valid_expiry() >=
-                base::Time::FromInternalValue(kJanuary2017) &&
-            GetSecurityLevelForFieldTrialGroup(
-                base::FieldTrialList::FindFullName("SHA1ToolbarUIJanuary2017"),
-                &security_level)) {
-          return security_level;
-        }
-        if (cert->valid_expiry() >= base::Time::FromInternalValue(kJune2016) &&
-            GetSecurityLevelForFieldTrialGroup(
-                base::FieldTrialList::FindFullName("SHA1ToolbarUIJune2016"),
-                &security_level)) {
-          return security_level;
+            base::Time::FromInternalValue(kJanuary2017)) {
+          return SECURITY_ERROR;
         }
         if (cert->valid_expiry() >=
-                base::Time::FromInternalValue(kJanuary2016) &&
-            GetSecurityLevelForFieldTrialGroup(
-                base::FieldTrialList::FindFullName("SHA1ToolbarUIJanuary2016"),
-                &security_level)) {
-          return security_level;
+            base::Time::FromInternalValue(kJanuary2016)) {
+          return SECURITY_WARNING;
         }
       }
       if (net::IsCertStatusError(ssl.cert_status)) {
         DCHECK(net::IsCertStatusMinorError(ssl.cert_status));
         return SECURITY_WARNING;
       }
       if (net::SSLConnectionStatusToVersion(ssl.connection_status) ==
           net::SSL_CONNECTION_VERSION_SSL3) {
         // SSLv3 will be removed in the future.
         return SECURITY_WARNING;
@@ skipping 189 matching lines @@
   if (entry &&
       google_util::StartsWithCommandLineGoogleBaseURL(entry->GetVirtualURL()))
     return search_terms;
 
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
   ToolbarModel::SecurityLevel security_level = GetSecurityLevel(ignore_editing);
   return ((security_level == NONE) || (security_level == SECURITY_ERROR)) ?
       base::string16() : search_terms;
 }