| Index: content/common/origin_util.cc
|
| diff --git a/content/common/origin_util.cc b/content/common/origin_util.cc
|
| index 4dfdc6ce8caf7efae0598c82dace3bc6171e8b65..268fe43b74743bb37f4cf058201569e81611744b 100644
|
| --- a/content/common/origin_util.cc
|
| +++ b/content/common/origin_util.cc
|
| @@ -62,10 +62,8 @@ bool IsOriginSecure(const GURL& url) {
|
| if (ContainsKey(g_trustworthy_whitelist.Get().secure_schemes(), url.scheme()))
|
| return true;
|
|
|
| - if (ContainsKey(g_trustworthy_whitelist.Get().secure_origins(),
|
| - url.GetOrigin())) {
|
| + if (IsOriginWhiteListedTrustworthy(url))
|
| return true;
|
| - }
|
|
|
| return false;
|
| }
|
| @@ -82,6 +80,11 @@ bool OriginCanAccessServiceWorkers(const GURL& url) {
|
| return false;
|
| }
|
|
|
| +bool IsOriginWhiteListedTrustworthy(const GURL& url) {
|
| + return ContainsKey(g_trustworthy_whitelist.Get().secure_origins(),
|
| + url.GetOrigin());
|
| +}
|
| +
|
| void ResetSchemesAndOriginsWhitelistForTesting() {
|
| g_trustworthy_whitelist.Get().Reset();
|
| }
|
|
|