Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Unified Diff: chrome/browser/ui/android/toolbar/toolbar_model_android.cc

Issue 1102063002: Remove the SHA-1 deprecation field trial code; the plan is live (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reformated Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/toolbar/toolbar_model_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
}
« no previous file with comments | « no previous file | chrome/browser/ui/toolbar/toolbar_model_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698