| Index: content/common/origin_util.cc
|
| diff --git a/content/common/origin_util.cc b/content/common/origin_util.cc
|
| index e8a348c0bedd4f630e3d395793f5c363a288260c..d6e806a3c85073b7e287415ebc2c1a93f9533d1f 100644
|
| --- a/content/common/origin_util.cc
|
| +++ b/content/common/origin_util.cc
|
| @@ -10,6 +10,7 @@
|
| #include "content/common/url_schemes.h"
|
| #include "net/base/url_util.h"
|
| #include "url/gurl.h"
|
| +#include "url/url_util.h"
|
|
|
| namespace content {
|
|
|
| @@ -26,7 +27,7 @@ bool IsOriginSecure(const GURL& url) {
|
| if (net::IsLocalhost(hostname))
|
| return true;
|
|
|
| - if (base::ContainsValue(GetSecureSchemes(), url.scheme()))
|
| + if (base::ContainsValue(url::GetSecureSchemes(), url.scheme()))
|
| return true;
|
|
|
| if (base::ContainsValue(GetSecureOrigins(), url.GetOrigin())) {
|
| @@ -47,8 +48,4 @@ bool OriginCanAccessServiceWorkers(const GURL& url) {
|
| return false;
|
| }
|
|
|
| -void ResetSchemesAndOriginsWhitelistForTesting() {
|
| - RefreshSecuritySchemesForTesting();
|
| -}
|
| -
|
| } // namespace content
|
|
|