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

Unified Diff: chrome/browser/ssl/security_state_model_android.cc

Issue 2363623002: Remove SecurityStateModel memoization (Closed)
Patch Set: Created 4 years, 3 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
Index: chrome/browser/ssl/security_state_model_android.cc
diff --git a/chrome/browser/ssl/security_state_model_android.cc b/chrome/browser/ssl/security_state_model_android.cc
index ad24fa05388fc01e883912275d03a90023f3e960..c39fefac88db28af4335f1f5394a60e119720ddf 100644
--- a/chrome/browser/ssl/security_state_model_android.cc
+++ b/chrome/browser/ssl/security_state_model_android.cc
@@ -28,7 +28,9 @@ jint GetSecurityLevelForWebContents(
ChromeSecurityStateModelClient* model_client =
ChromeSecurityStateModelClient::FromWebContents(web_contents);
DCHECK(model_client);
- return model_client->GetSecurityInfo().security_level;
+ security_state::SecurityStateModel::SecurityInfo security_info;
+ model_client->GetSecurityInfo(&security_info);
+ return security_info.security_level;
}
// static
@@ -42,7 +44,9 @@ jboolean IsDeprecatedSHA1Present(JNIEnv* env,
ChromeSecurityStateModelClient* model_client =
ChromeSecurityStateModelClient::FromWebContents(web_contents);
DCHECK(model_client);
- return model_client->GetSecurityInfo().sha1_deprecation_status !=
+ security_state::SecurityStateModel::SecurityInfo security_info;
+ model_client->GetSecurityInfo(&security_info);
+ return security_info.sha1_deprecation_status !=
security_state::SecurityStateModel::NO_DEPRECATED_SHA1;
}
@@ -58,9 +62,11 @@ jboolean IsPassiveMixedContentPresent(
ChromeSecurityStateModelClient* model_client =
ChromeSecurityStateModelClient::FromWebContents(web_contents);
DCHECK(model_client);
- return model_client->GetSecurityInfo().mixed_content_status ==
+ security_state::SecurityStateModel::SecurityInfo security_info;
+ model_client->GetSecurityInfo(&security_info);
+ return security_info.mixed_content_status ==
security_state::SecurityStateModel::CONTENT_STATUS_DISPLAYED ||
- model_client->GetSecurityInfo().mixed_content_status ==
+ security_info.mixed_content_status ==
security_state::SecurityStateModel::
CONTENT_STATUS_DISPLAYED_AND_RAN;
}
« no previous file with comments | « chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698