CSP: Allow secure upgrade from an explicitly insecure expression.

content/common/content_security_policy/csp_context.h

 // 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.
 
 #ifndef CONTENT_COMMON_CONTENT_SECURITY_POLICY_CSP_CONTEXT_H_
 #define CONTENT_COMMON_CONTENT_SECURITY_POLICY_CSP_CONTEXT_H_
 
 #include <vector>
 
 #include "content/common/content_export.h"
@@ skipping 22 matching lines @@
   // * triggering the "SecurityPolicyViolation" javascript event.
   // * sending a JSON report to any uri defined with the "report-uri" directive.
   // Returns true when the request can proceed, false otherwise.
   bool IsAllowedByCsp(CSPDirective::Name directive_name,
                       const GURL& url,
                       bool is_redirect,
                       const SourceLocation& source_location);
 
   void SetSelf(const url::Origin origin);
   bool AllowSelf(const GURL& url);
-  bool ProtocolMatchesSelf(const GURL& url);
+  bool ProtocolIsSelf(const GURL& url);
+  const std::string& GetSelfScheme();
 
   virtual void ReportContentSecurityPolicyViolation(
       const CSPViolationParams& violation_params);
 
   bool SelfSchemeShouldBypassCsp();
 
   void ResetContentSecurityPolicies() { policies_.clear(); }
   void AddContentSecurityPolicy(const ContentSecurityPolicy& policy) {
     policies_.push_back(policy);
   }
@@ skipping 51 matching lines @@
 
   // Whether or not the violation happens after a redirect.
   bool after_redirect;
 
   // The source code location that triggered the blocked navigation.
   SourceLocation source_location;
 };
 
 }  // namespace content
 #endif  // CONTENT_COMMON_CONTENT_SECURITY_POLICY_CSP_CONTEXT_H_