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

content/common/service_worker/service_worker_utils.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/service_worker/service_worker_utils.h"
 
 #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 {
 
 namespace {
 
 bool PathContainsDisallowedCharacter(const GURL& url) {
   std::string path = url.path();
   DCHECK(base::IsStringUTF8(path));
 
   // We should avoid these escaped characters in the path component because
   // these can be handled differently depending on server implementation.
   if (path.find("%2f") != std::string::npos ||
       path.find("%2F") != std::string::npos) {
     return true;
   }
   if (path.find("%5c") != std::string::npos ||
       path.find("%5C") != std::string::npos) {
     return true;
   }
   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
 bool ServiceWorkerUtils::ScopeMatches(const GURL& scope, const GURL& url) {
   DCHECK(!scope.has_ref());
   return base::StartsWith(url.spec(), scope.spec(),
                           base::CompareCase::SENSITIVE);
 }
 
 // static
@@ skipping 60 matching lines @@
   return false;
 }
 
 // static
 bool ServiceWorkerUtils::CanRegisterServiceWorker(const GURL& context_url,
                                                   const GURL& pattern,
                                                   const GURL& script_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);
 }
 
 bool LongestScopeMatcher::MatchLongest(const GURL& scope) {
   if (!ServiceWorkerUtils::ScopeMatches(scope, url_))
     return false;
   if (match_.is_empty() || match_.spec().size() < scope.spec().size()) {
     match_ = scope;
     return true;
   }
   return false;
 }
 
 }  // namespace content