Revert of Embedding-CSP: Refactoring directive strings into enum

third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h

 // 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.
 
 #ifndef CSPDirectiveList_h
 #define CSPDirectiveList_h
 
 #include "core/fetch/Resource.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/frame/csp/MediaListDirective.h"
@@ skipping 172 matching lines @@
 
   template <class CSPDirectiveType>
   void setCSPDirective(const String& name,
                        const String& value,
                        Member<CSPDirectiveType>&);
 
   SourceListDirective* operativeDirective(SourceListDirective*) const;
   SourceListDirective* operativeDirective(SourceListDirective*,
                                           SourceListDirective* override) const;
   void reportViolation(const String& directiveText,
-                       const ContentSecurityPolicy::DirectiveType&,
+                       const String& effectiveDirective,
                        const String& consoleMessage,
                        const KURL& blockedURL,
                        ResourceRequest::RedirectStatus) const;
   void reportViolationWithFrame(const String& directiveText,
-                                const ContentSecurityPolicy::DirectiveType&,
+                                const String& effectiveDirective,
                                 const String& consoleMessage,
                                 const KURL& blockedURL,
                                 LocalFrame*) const;
   void reportViolationWithLocation(const String& directiveText,
-                                   const ContentSecurityPolicy::DirectiveType&,
+                                   const String& effectiveDirective,
                                    const String& consoleMessage,
                                    const KURL& blockedURL,
                                    const String& contextURL,
                                    const WTF::OrdinalNumber& contextLine,
                                    Element*) const;
   void reportViolationWithState(
       const String& directiveText,
-      const ContentSecurityPolicy::DirectiveType&,
+      const String& effectiveDirective,
       const String& message,
       const KURL& blockedURL,
       ScriptState*,
       const ContentSecurityPolicy::ExceptionStatus) const;
 
   bool checkEval(SourceListDirective*) const;
   bool checkInline(SourceListDirective*) const;
   bool checkDynamic(SourceListDirective*) const;
   bool isMatchingNoncePresent(SourceListDirective*, const String&) const;
   bool checkHash(SourceListDirective*, const CSPHashValue&) const;
@@ skipping 18 matching lines @@
       ContentSecurityPolicy::ExceptionStatus =
           ContentSecurityPolicy::WillNotThrowException) const;
   bool checkInlineAndReportViolation(SourceListDirective*,
                                      const String& consoleMessage,
                                      Element*,
                                      const String& contextURL,
                                      const WTF::OrdinalNumber& contextLine,
                                      bool isScript,
                                      const String& hashValue) const;
 
-  bool checkSourceAndReportViolation(
-      SourceListDirective*,
-      const KURL&,
-      const ContentSecurityPolicy::DirectiveType&,
-      ResourceRequest::RedirectStatus) const;
+  bool checkSourceAndReportViolation(SourceListDirective*,
+                                     const KURL&,
+                                     const String& effectiveDirective,
+                                     ResourceRequest::RedirectStatus) const;
   bool checkMediaTypeAndReportViolation(MediaListDirective*,
                                         const String& type,
                                         const String& typeAttribute,
                                         const String& consoleMessage) const;
   bool checkAncestorsAndReportViolation(SourceListDirective*,
                                         LocalFrame*,
                                         const KURL&) const;
   bool checkRequestWithoutIntegrityAndReportViolation(
       WebURLRequest::RequestContext,
       const KURL&,
@@ skipping 34 matching lines @@
   uint8_t m_requireSRIFor;
 
   Vector<String> m_reportEndpoints;
 
   String m_evalDisabledErrorMessage;
 };
 
 }  // namespace blink
 
 #endif