Moved all tests about bypassing CSP into csp-tests (content layer)

content/common/content_security_policy/csp_source_list.cc

 // Copyright 2017 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/content_security_policy/csp_context.h"
 
 namespace content {
 
 namespace {
 
-const GURL ExtractInnerURL(const GURL& url) {
-  if (const GURL* inner_url = url.inner_url())
-    return *inner_url;
-  else
-    // TODO(arthursonzogni): revisit this once GURL::inner_url support blob-URL.
-    return GURL(url.path());
-}
-
-const GURL GetEffectiveURL(CSPContext* context, const GURL& url) {
-  // Due to backwards-compatibility concerns, we allow 'self' to match blob and
-  // filesystem inner URLs if we are in a context that bypasses
-  // ContentSecurityPolicy in the main world.
-  if (context->SelfSchemeShouldBypassCsp()) {
-    if (url.SchemeIsFileSystem() || url.SchemeIsBlob())
-      return ExtractInnerURL(url);
-  }
-  return url;
-}
-
 bool AllowFromSources(const GURL& url,
                       const std::vector<CSPSource>& sources,
                       CSPContext* context,
                       bool is_redirect) {
   for (const CSPSource& source : sources) {
     if (CSPSource::Allow(source, url, context, is_redirect))
       return true;
   }
   return false;
 }
@@ skipping 23 matching lines @@
   // list.
   if (source_list.allow_star) {
     if (url.SchemeIsHTTPOrHTTPS() || url.SchemeIsSuborigin() ||
         url.SchemeIsWSOrWSS() || url.SchemeIs("ftp") ||
         context->ProtocolMatchesSelf(url))
       return true;
 
     return AllowFromSources(url, source_list.sources, context, is_redirect);
   }
 
-  const GURL effective_url = GetEffectiveURL(context, url);
+  if (source_list.allow_self && context->AllowSelf(url)) return true;

[arthursonzogni, 2017/04/05 08:27:13]

Nit: please use two lines.

 
-  if (source_list.allow_self && context->AllowSelf(effective_url))
-    return true;
-
-  return AllowFromSources(effective_url, source_list.sources, context,
-                          is_redirect);
+  return AllowFromSources(url, source_list.sources, context, is_redirect);
 }
 
 std::string CSPSourceList::ToString() const {
   if (IsNone())
     return "'none'";
   if (allow_star)
     return "*";
 
   bool is_empty = true;
   std::stringstream text;
@@ skipping 10 matching lines @@
   }
 
   return text.str();
 }
 
 bool CSPSourceList::IsNone() const {
   return !allow_self && !allow_star && sources.empty();
 }
 
 }  // namespace content