[ServiceWorker] Don't check the origin equality when disable-web-security flag is set.

content/common/service_worker/service_worker_utils.cc

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..fbc1de1e0eefa1dc51d43a1ff62fc744da2b3a8d 100644
--- a/content/common/service_worker/service_worker_utils.cc
+++ b/content/common/service_worker/service_worker_utils.cc
@@ -6,8 +6,10 @@
 
 #include <string>
 
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "content/public/common/content_switches.h"

[nhiroki, 2016/08/01 08:21:25]

These inclusions are not necessary.

[horo, 2016/08/01 10:48:47]

Done.

 #include "content/public/common/origin_util.h"
 
 namespace content {
@@ -31,11 +33,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 +113,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);