Index: content/common/service_worker/service_worker_utils.cc |
diff --git a/content/common/service_worker/service_worker_utils.cc b/content/common/service_worker/service_worker_utils.cc |
index 3a4971fc4ec7cd75a1cd022eba2e40853a891811..30faed4513617bdbe49af964b5d364da2e0f6d8d 100644 |
--- a/content/common/service_worker/service_worker_utils.cc |
+++ b/content/common/service_worker/service_worker_utils.cc |
@@ -31,11 +31,6 @@ bool PathContainsDisallowedCharacter(const GURL& url) { |
return false; |
} |
-bool AllOriginsMatch(const GURL& url_a, const GURL& url_b, const GURL& url_c) { |
- return url_a.GetOrigin() == url_b.GetOrigin() && |
- url_a.GetOrigin() == url_c.GetOrigin(); |
-} |
- |
} // namespace |
// static |
@@ -116,7 +111,8 @@ bool ServiceWorkerUtils::CanRegisterServiceWorker(const GURL& context_url, |
DCHECK(context_url.is_valid()); |
DCHECK(pattern.is_valid()); |
DCHECK(script_url.is_valid()); |
- return AllOriginsMatch(context_url, pattern, script_url) && |
+ return ServiceWorkerUtils::PassOriginEqualitySecurityCheck<GURL>( |
+ context_url, pattern, script_url) && |
OriginCanAccessServiceWorkers(context_url) && |
OriginCanAccessServiceWorkers(pattern) && |
OriginCanAccessServiceWorkers(script_url); |