Index: chrome/browser/ui/android/toolbar/toolbar_model_android.cc |
diff --git a/chrome/browser/ui/android/toolbar/toolbar_model_android.cc b/chrome/browser/ui/android/toolbar/toolbar_model_android.cc |
index 3990d36e90524cce104ef0956270879f0f41bc58..2884faf535c765244e53fa8c79cbf10a5db5d65c 100644 |
--- a/chrome/browser/ui/android/toolbar/toolbar_model_android.cc |
+++ b/chrome/browser/ui/android/toolbar/toolbar_model_android.cc |
@@ -117,11 +117,7 @@ jboolean IsDeprecatedSHA1Present(JNIEnv* env, |
static const int64_t kJanuary2016 = INT64_C(13096080000000000); |
if (content::CertStore::GetInstance()->RetrieveCert(ssl.cert_id, &cert) && |
(ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT) && |
- cert->valid_expiry() > base::Time::FromInternalValue(kJanuary2016) && |
- // NOTE: This use of SHA1IdentityUIWarning needs to be kept in sync |
- // with WebsiteSettings::Init(). |
- base::FieldTrialList::FindFullName("SHA1IdentityUIWarning") == |
- "Enabled") { |
+ cert->valid_expiry() > base::Time::FromInternalValue(kJanuary2016)) { |
return true; |
} |
} |