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

Unified Diff: content/common/origin_util.cc

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message
Patch Set: Address jam@ comments; many minor code and comment updates. Created 3 years, 11 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: content/common/origin_util.cc
diff --git a/content/common/origin_util.cc b/content/common/origin_util.cc
index e8a348c0bedd4f630e3d395793f5c363a288260c..795e9a2bfcb3774b1d268572d51dc0981ac16200 100644
--- a/content/common/origin_util.cc
+++ b/content/common/origin_util.cc
@@ -29,9 +29,8 @@ bool IsOriginSecure(const GURL& url) {
if (base::ContainsValue(GetSecureSchemes(), url.scheme()))
return true;
- if (base::ContainsValue(GetSecureOrigins(), url.GetOrigin())) {
+ if (IsOriginWhiteListedTrustworthy(url))
return true;
- }
return false;
}
@@ -47,6 +46,10 @@ bool OriginCanAccessServiceWorkers(const GURL& url) {
return false;
}
+bool IsOriginWhiteListedTrustworthy(const GURL& url) {
+ return base::ContainsValue(GetSecureOrigins(), url.GetOrigin());
+}
+
void ResetSchemesAndOriginsWhitelistForTesting() {
RefreshSecuritySchemesForTesting();
}

Powered by Google App Engine
This is Rietveld 408576698