Revert of Embedding-CSP: Refactoring directive strings into enum

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

 // 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 "core/frame/csp/CSPDirectiveList.h"
 
 #include "bindings/core/v8/SourceLocation.h"
 #include "core/dom/Document.h"
 #include "core/dom/SecurityContext.h"
 #include "core/dom/SpaceSplitString.h"
@@ skipping 69 matching lines @@
   if (directives->isReportOnly() &&
       source != ContentSecurityPolicyHeaderSourceMeta &&
       directives->reportEndpoints().isEmpty())
     policy->reportMissingReportURI(String(begin, end - begin));
 
   return directives;
 }
 
 void CSPDirectiveList::reportViolation(
     const String& directiveText,
-    const ContentSecurityPolicy::DirectiveType& effectiveType,
+    const String& effectiveDirective,
     const String& consoleMessage,
     const KURL& blockedURL,
     ResourceRequest::RedirectStatus redirectStatus) const {
   String message =
       isReportOnly() ? "[Report Only] " + consoleMessage : consoleMessage;
   m_policy->logToConsole(ConsoleMessage::create(SecurityMessageSource,
                                                 ErrorMessageLevel, message));
-  m_policy->reportViolation(directiveText, effectiveType, message, blockedURL,
-                            m_reportEndpoints, m_header, m_headerType,
-                            ContentSecurityPolicy::URLViolation, nullptr,
-                            redirectStatus);
+  m_policy->reportViolation(directiveText, effectiveDirective, message,
+                            blockedURL, m_reportEndpoints, m_header,
+                            m_headerType, ContentSecurityPolicy::URLViolation,
+                            nullptr, redirectStatus);
 }
 
 void CSPDirectiveList::reportViolationWithFrame(
     const String& directiveText,
-    const ContentSecurityPolicy::DirectiveType& effectiveType,
+    const String& effectiveDirective,
     const String& consoleMessage,
     const KURL& blockedURL,
     LocalFrame* frame) const {
   String message =
       isReportOnly() ? "[Report Only] " + consoleMessage : consoleMessage;
   m_policy->logToConsole(
       ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, message),
       frame);
-  m_policy->reportViolation(directiveText, effectiveType, message, blockedURL,
-                            m_reportEndpoints, m_header, m_headerType,
-                            ContentSecurityPolicy::URLViolation, frame);
+  m_policy->reportViolation(
+      directiveText, effectiveDirective, message, blockedURL, m_reportEndpoints,
+      m_header, m_headerType, ContentSecurityPolicy::URLViolation, frame);
 }
 
 void CSPDirectiveList::reportViolationWithLocation(
     const String& directiveText,
-    const ContentSecurityPolicy::DirectiveType& effectiveType,
+    const String& effectiveDirective,
     const String& consoleMessage,
     const KURL& blockedURL,
     const String& contextURL,
     const WTF::OrdinalNumber& contextLine,
     Element* element) const {
   String message =
       isReportOnly() ? "[Report Only] " + consoleMessage : consoleMessage;
   m_policy->logToConsole(ConsoleMessage::create(
       SecurityMessageSource, ErrorMessageLevel, message,
       SourceLocation::capture(contextURL, contextLine.oneBasedInt(), 0)));
   m_policy->reportViolation(
-      directiveText, effectiveType, message, blockedURL, m_reportEndpoints,
+      directiveText, effectiveDirective, message, blockedURL, m_reportEndpoints,
       m_header, m_headerType, ContentSecurityPolicy::InlineViolation, nullptr,
       RedirectStatus::NoRedirect, contextLine.oneBasedInt(), element);
 }
 
 void CSPDirectiveList::reportViolationWithState(
     const String& directiveText,
-    const ContentSecurityPolicy::DirectiveType& effectiveType,
+    const String& effectiveDirective,
     const String& message,
     const KURL& blockedURL,
     ScriptState* scriptState,
     const ContentSecurityPolicy::ExceptionStatus exceptionStatus) const {
   String reportMessage = isReportOnly() ? "[Report Only] " + message : message;
   // Print a console message if it won't be redundant with a
   // JavaScript exception that the caller will throw. (Exceptions will
   // never get thrown in report-only mode because the caller won't see
   // a violation.)
   if (isReportOnly() ||
       exceptionStatus == ContentSecurityPolicy::WillNotThrowException) {
     ConsoleMessage* consoleMessage = ConsoleMessage::create(
         SecurityMessageSource, ErrorMessageLevel, reportMessage);
     m_policy->logToConsole(consoleMessage);
   }
-  m_policy->reportViolation(directiveText, effectiveType, message, blockedURL,
-                            m_reportEndpoints, m_header, m_headerType,
-                            ContentSecurityPolicy::EvalViolation);
+  m_policy->reportViolation(directiveText, effectiveDirective, message,
+                            blockedURL, m_reportEndpoints, m_header,
+                            m_headerType, ContentSecurityPolicy::EvalViolation);
 }
 
 bool CSPDirectiveList::checkEval(SourceListDirective* directive) const {
   return !directive || directive->allowEval();
 }
 
 bool CSPDirectiveList::checkInline(SourceListDirective* directive) const {
   return !directive ||
          (directive->allowInline() && !directive->isHashOrNoncePresent());
 }
@@ skipping 14 matching lines @@
 }
 
 bool CSPDirectiveList::checkDynamic(SourceListDirective* directive) const {
   return !directive || directive->allowDynamic();
 }
 
 void CSPDirectiveList::reportMixedContent(
     const KURL& mixedURL,
     ResourceRequest::RedirectStatus redirectStatus) const {
   if (strictMixedContentChecking()) {
-    m_policy->reportViolation(
-        ContentSecurityPolicy::getDirectiveName(
-            ContentSecurityPolicy::DirectiveType::BlockAllMixedContent),
-        ContentSecurityPolicy::DirectiveType::BlockAllMixedContent, String(),
-        mixedURL, m_reportEndpoints, m_header, m_headerType,
-        ContentSecurityPolicy::URLViolation, nullptr, redirectStatus);
+    m_policy->reportViolation(ContentSecurityPolicy::BlockAllMixedContent,
+                              ContentSecurityPolicy::BlockAllMixedContent,
+                              String(), mixedURL, m_reportEndpoints, m_header,
+                              m_headerType, ContentSecurityPolicy::URLViolation,
+                              nullptr, redirectStatus);
   }
 }
 
 bool CSPDirectiveList::checkSource(
     SourceListDirective* directive,
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus) const {
   // If |url| is empty, fall back to the policy URL to ensure that <object>'s
   // without a `src` can be blocked/allowed, as they can still load plugins
   // even though they don't actually have a URL.
@@ skipping 66 matching lines @@
     case WebURLRequest::RequestContextSharedWorker:
       resourceType = "shared worker";
       break;
     case WebURLRequest::RequestContextWorker:
       resourceType = "worker";
       break;
     default:
       break;
   }
 
-  reportViolation(ContentSecurityPolicy::getDirectiveName(
-                      ContentSecurityPolicy::DirectiveType::RequireSRIFor),
-                  ContentSecurityPolicy::DirectiveType::RequireSRIFor,
+  reportViolation(ContentSecurityPolicy::RequireSRIFor,
+                  ContentSecurityPolicy::RequireSRIFor,
                   "Refused to load the " + resourceType + " '" +
                       url.elidedString() +
                       "' because 'require-sri-for' directive requires "
                       "integrity attribute be present for all " +
                       resourceType + "s.",
                   url, redirectStatus);
   return denyIfEnforcingPolicy();
 }
 
 bool CSPDirectiveList::allowRequestWithoutIntegrity(
@@ skipping 36 matching lines @@
   if (checkEval(directive))
     return true;
 
   String suffix = String();
   if (directive == m_defaultSrc)
     suffix =
         " Note that 'script-src' was not explicitly set, so 'default-src' is "
         "used as a fallback.";
 
   reportViolationWithState(
-      directive->text(), ContentSecurityPolicy::DirectiveType::ScriptSrc,
+      directive->text(), ContentSecurityPolicy::ScriptSrc,
       consoleMessage + "\"" + directive->text() + "\"." + suffix + "\n", KURL(),
       scriptState, exceptionStatus);
   if (!isReportOnly()) {
     m_policy->reportBlockedScriptExecutionToInspector(directive->text());
     return false;
   }
   return true;
 }
 
 bool CSPDirectiveList::checkMediaTypeAndReportViolation(
     MediaListDirective* directive,
     const String& type,
     const String& typeAttribute,
     const String& consoleMessage) const {
   if (checkMediaType(directive, type, typeAttribute))
     return true;
 
   String message = consoleMessage + "\'" + directive->text() + "\'.";
   if (typeAttribute.isEmpty())
     message = message +
               " When enforcing the 'plugin-types' directive, the plugin's "
               "media type must be explicitly declared with a 'type' attribute "
               "on the containing element (e.g. '<object type=\"[TYPE GOES "
               "HERE]\" ...>').";
 
   // 'RedirectStatus::NoRedirect' is safe here, as we do the media type check
   // before actually loading data; this means that we shouldn't leak redirect
   // targets, as we won't have had a chance to redirect yet.
-  reportViolation(
-      directive->text(), ContentSecurityPolicy::DirectiveType::PluginTypes,
-      message + "\n", KURL(), ResourceRequest::RedirectStatus::NoRedirect);
+  reportViolation(directive->text(), ContentSecurityPolicy::PluginTypes,
+                  message + "\n", KURL(),
+                  ResourceRequest::RedirectStatus::NoRedirect);
   return denyIfEnforcingPolicy();
 }
 
 bool CSPDirectiveList::checkInlineAndReportViolation(
     SourceListDirective* directive,
     const String& consoleMessage,
     Element* element,
     const String& contextURL,
     const WTF::OrdinalNumber& contextLine,
     bool isScript,
@@ skipping 13 matching lines @@
         " Either the 'unsafe-inline' keyword, a hash ('" + hashValue +
         "'), or a nonce ('nonce-...') is required to enable inline execution.";
     if (directive == m_defaultSrc)
       suffix = suffix + " Note also that '" +
                String(isScript ? "script" : "style") +
                "-src' was not explicitly set, so 'default-src' is used as a "
                "fallback.";
   }
 
   reportViolationWithLocation(
-      directive->text(),
-      isScript ? ContentSecurityPolicy::DirectiveType::ScriptSrc
-               : ContentSecurityPolicy::DirectiveType::StyleSrc,
+      directive->text(), isScript ? ContentSecurityPolicy::ScriptSrc
+                                  : ContentSecurityPolicy::StyleSrc,
       consoleMessage + "\"" + directive->text() + "\"." + suffix + "\n", KURL(),
       contextURL, contextLine, element);
 
   if (!isReportOnly()) {
     if (isScript)
       m_policy->reportBlockedScriptExecutionToInspector(directive->text());
     return false;
   }
   return true;
 }
 
 bool CSPDirectiveList::checkSourceAndReportViolation(
     SourceListDirective* directive,
     const KURL& url,
-    const ContentSecurityPolicy::DirectiveType& effectiveType,
+    const String& effectiveDirective,
     ResourceRequest::RedirectStatus redirectStatus) const {
   if (!directive)
     return true;
 
   // We ignore URL-based whitelists if we're allowing dynamic script injection.
   if (checkSource(directive, url, redirectStatus) && !checkDynamic(directive))
     return true;
 
   // We should never have a violation against `child-src` or `default-src`
   // directly; the effective directive should always be one of the explicit
   // fetch directives.
-  DCHECK_NE(ContentSecurityPolicy::DirectiveType::ChildSrc, effectiveType);
-  DCHECK_NE(ContentSecurityPolicy::DirectiveType::DefaultSrc, effectiveType);
+  DCHECK_NE(ContentSecurityPolicy::ChildSrc, effectiveDirective);
+  DCHECK_NE(ContentSecurityPolicy::DefaultSrc, effectiveDirective);
 
   String prefix;
-  if (ContentSecurityPolicy::DirectiveType::BaseURI == effectiveType)
+  if (ContentSecurityPolicy::BaseURI == effectiveDirective)
     prefix = "Refused to set the document's base URI to '";
-  else if (ContentSecurityPolicy::DirectiveType::WorkerSrc == effectiveType)
+  else if (ContentSecurityPolicy::WorkerSrc == effectiveDirective)
     prefix = "Refused to create a worker from '";
-  else if (ContentSecurityPolicy::DirectiveType::ConnectSrc == effectiveType)
+  else if (ContentSecurityPolicy::ConnectSrc == effectiveDirective)
     prefix = "Refused to connect to '";
-  else if (ContentSecurityPolicy::DirectiveType::FontSrc == effectiveType)
+  else if (ContentSecurityPolicy::FontSrc == effectiveDirective)
     prefix = "Refused to load the font '";
-  else if (ContentSecurityPolicy::DirectiveType::FormAction == effectiveType)
+  else if (ContentSecurityPolicy::FormAction == effectiveDirective)
     prefix = "Refused to send form data to '";
-  else if (ContentSecurityPolicy::DirectiveType::FrameSrc == effectiveType)
+  else if (ContentSecurityPolicy::FrameSrc == effectiveDirective)
     prefix = "Refused to frame '";
-  else if (ContentSecurityPolicy::DirectiveType::ImgSrc == effectiveType)
+  else if (ContentSecurityPolicy::ImgSrc == effectiveDirective)
     prefix = "Refused to load the image '";
-  else if (ContentSecurityPolicy::DirectiveType::MediaSrc == effectiveType)
+  else if (ContentSecurityPolicy::MediaSrc == effectiveDirective)
     prefix = "Refused to load media from '";
-  else if (ContentSecurityPolicy::DirectiveType::ManifestSrc == effectiveType)
+  else if (ContentSecurityPolicy::ManifestSrc == effectiveDirective)
     prefix = "Refused to load manifest from '";
-  else if (ContentSecurityPolicy::DirectiveType::ObjectSrc == effectiveType)
+  else if (ContentSecurityPolicy::ObjectSrc == effectiveDirective)
     prefix = "Refused to load plugin data from '";
-  else if (ContentSecurityPolicy::DirectiveType::ScriptSrc == effectiveType)
+  else if (ContentSecurityPolicy::ScriptSrc == effectiveDirective)
     prefix = "Refused to load the script '";
-  else if (ContentSecurityPolicy::DirectiveType::StyleSrc == effectiveType)
+  else if (ContentSecurityPolicy::StyleSrc == effectiveDirective)
     prefix = "Refused to load the stylesheet '";
 
   String suffix = String();
   if (checkDynamic(directive))
     suffix =
         " 'strict-dynamic' is present, so host-based whitelisting is disabled.";
   if (directive == m_defaultSrc)
     suffix =
-        suffix + " Note that '" +
-        ContentSecurityPolicy::getDirectiveName(effectiveType) +
+        suffix + " Note that '" + effectiveDirective +
         "' was not explicitly set, so 'default-src' is used as a fallback.";
 
-  reportViolation(directive->text(), effectiveType,
+  reportViolation(directive->text(), effectiveDirective,
                   prefix + url.elidedString() +
                       "' because it violates the following Content Security "
                       "Policy directive: \"" +
                       directive->text() + "\"." + suffix + "\n",
                   url, redirectStatus);
   return denyIfEnforcingPolicy();
 }
 
 bool CSPDirectiveList::checkAncestorsAndReportViolation(
     SourceListDirective* directive,
     LocalFrame* frame,
     const KURL& url) const {
   if (checkAncestors(directive, frame))
     return true;
 
-  reportViolationWithFrame(directive->text(),
-                           ContentSecurityPolicy::DirectiveType::FrameAncestors,
+  reportViolationWithFrame(directive->text(), "frame-ancestors",
                            "Refused to display '" + url.elidedString() +
                                "' in a frame because an ancestor violates the "
                                "following Content Security Policy directive: "
                                "\"" +
                                directive->text() + "\".",
                            url, frame);
   return denyIfEnforcingPolicy();
 }
 
 bool CSPDirectiveList::allowJavaScriptURLs(
@@ skipping 105 matching lines @@
     ParserDisposition parserDisposition,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   if (isMatchingNoncePresent(operativeDirective(m_scriptSrc.get()), nonce))
     return true;
   if (parserDisposition == NotParserInserted && allowDynamic())
     return true;
   return reportingStatus == ContentSecurityPolicy::SendReport
              ? checkSourceAndReportViolation(
                    operativeDirective(m_scriptSrc.get()), url,
-                   ContentSecurityPolicy::DirectiveType::ScriptSrc,
-                   redirectStatus)
+                   ContentSecurityPolicy::ScriptSrc, redirectStatus)
              : checkSource(operativeDirective(m_scriptSrc.get()), url,
                            redirectStatus);
 }
 
 bool CSPDirectiveList::allowObjectFromSource(
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   if (url.protocolIsAbout())
     return true;
   return reportingStatus == ContentSecurityPolicy::SendReport
              ? checkSourceAndReportViolation(
                    operativeDirective(m_objectSrc.get()), url,
-                   ContentSecurityPolicy::DirectiveType::ObjectSrc,
-                   redirectStatus)
+                   ContentSecurityPolicy::ObjectSrc, redirectStatus)
              : checkSource(operativeDirective(m_objectSrc.get()), url,
                            redirectStatus);
 }
 
 bool CSPDirectiveList::allowFrameFromSource(
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   if (url.protocolIsAbout())
     return true;
 
   // 'frame-src' overrides 'child-src', which overrides the default
   // sources. So, we do this nested set of calls to 'operativeDirective()' to
   // grab 'frame-src' if it exists, 'child-src' if it doesn't, and 'defaut-src'
   // if neither are available.
   SourceListDirective* whichDirective = operativeDirective(
       m_frameSrc.get(), operativeDirective(m_childSrc.get()));
 
   return reportingStatus == ContentSecurityPolicy::SendReport
-             ? checkSourceAndReportViolation(
-                   whichDirective, url,
-                   ContentSecurityPolicy::DirectiveType::FrameSrc,
-                   redirectStatus)
+             ? checkSourceAndReportViolation(whichDirective, url,
+                                             ContentSecurityPolicy::FrameSrc,
+                                             redirectStatus)
              : checkSource(whichDirective, url, redirectStatus);
 }
 
 bool CSPDirectiveList::allowImageFromSource(
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   return reportingStatus == ContentSecurityPolicy::SendReport
-             ? checkSourceAndReportViolation(
-                   operativeDirective(m_imgSrc.get()), url,
-                   ContentSecurityPolicy::DirectiveType::ImgSrc, redirectStatus)
+             ? checkSourceAndReportViolation(operativeDirective(m_imgSrc.get()),
+                                             url, ContentSecurityPolicy::ImgSrc,
+                                             redirectStatus)
              : checkSource(operativeDirective(m_imgSrc.get()), url,
                            redirectStatus);
 }
 
 bool CSPDirectiveList::allowStyleFromSource(
     const KURL& url,
     const String& nonce,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   if (isMatchingNoncePresent(operativeDirective(m_styleSrc.get()), nonce))
     return true;
   return reportingStatus == ContentSecurityPolicy::SendReport
              ? checkSourceAndReportViolation(
                    operativeDirective(m_styleSrc.get()), url,
-                   ContentSecurityPolicy::DirectiveType::StyleSrc,
-                   redirectStatus)
+                   ContentSecurityPolicy::StyleSrc, redirectStatus)
              : checkSource(operativeDirective(m_styleSrc.get()), url,
                            redirectStatus);
 }
 
 bool CSPDirectiveList::allowFontFromSource(
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   return reportingStatus == ContentSecurityPolicy::SendReport
              ? checkSourceAndReportViolation(
                    operativeDirective(m_fontSrc.get()), url,
-                   ContentSecurityPolicy::DirectiveType::FontSrc,
-                   redirectStatus)
+                   ContentSecurityPolicy::FontSrc, redirectStatus)
              : checkSource(operativeDirective(m_fontSrc.get()), url,
                            redirectStatus);
 }
 
 bool CSPDirectiveList::allowMediaFromSource(
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   return reportingStatus == ContentSecurityPolicy::SendReport
              ? checkSourceAndReportViolation(
                    operativeDirective(m_mediaSrc.get()), url,
-                   ContentSecurityPolicy::DirectiveType::MediaSrc,
-                   redirectStatus)
+                   ContentSecurityPolicy::MediaSrc, redirectStatus)
              : checkSource(operativeDirective(m_mediaSrc.get()), url,
                            redirectStatus);
 }
 
 bool CSPDirectiveList::allowManifestFromSource(
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   return reportingStatus == ContentSecurityPolicy::SendReport
              ? checkSourceAndReportViolation(
                    operativeDirective(m_manifestSrc.get()), url,
-                   ContentSecurityPolicy::DirectiveType::ManifestSrc,
-                   redirectStatus)
+                   ContentSecurityPolicy::ManifestSrc, redirectStatus)
              : checkSource(operativeDirective(m_manifestSrc.get()), url,
                            redirectStatus);
 }
 
 bool CSPDirectiveList::allowConnectToSource(
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   return reportingStatus == ContentSecurityPolicy::SendReport
              ? checkSourceAndReportViolation(
                    operativeDirective(m_connectSrc.get()), url,
-                   ContentSecurityPolicy::DirectiveType::ConnectSrc,
-                   redirectStatus)
+                   ContentSecurityPolicy::ConnectSrc, redirectStatus)
              : checkSource(operativeDirective(m_connectSrc.get()), url,
                            redirectStatus);
 }
 
 bool CSPDirectiveList::allowFormAction(
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   return reportingStatus == ContentSecurityPolicy::SendReport
-             ? checkSourceAndReportViolation(
-                   m_formAction.get(), url,
-                   ContentSecurityPolicy::DirectiveType::FormAction,
-                   redirectStatus)
+             ? checkSourceAndReportViolation(m_formAction.get(), url,
+                                             ContentSecurityPolicy::FormAction,
+                                             redirectStatus)
              : checkSource(m_formAction.get(), url, redirectStatus);
 }
 
 bool CSPDirectiveList::allowBaseURI(
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   return reportingStatus == ContentSecurityPolicy::SendReport
-             ? checkSourceAndReportViolation(
-                   m_baseURI.get(), url,
-                   ContentSecurityPolicy::DirectiveType::BaseURI,
-                   redirectStatus)
+             ? checkSourceAndReportViolation(m_baseURI.get(), url,
+                                             ContentSecurityPolicy::BaseURI,
+                                             redirectStatus)
              : checkSource(m_baseURI.get(), url, redirectStatus);
 }
 
 bool CSPDirectiveList::allowWorkerFromSource(
     const KURL& url,
     ResourceRequest::RedirectStatus redirectStatus,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   // 'worker-src' overrides 'child-src', which overrides the default
   // sources. So, we do this nested set of calls to 'operativeDirective()' to
   // grab 'worker-src' if it exists, 'child-src' if it doesn't, and 'defaut-src'
   // if neither are available.
   SourceListDirective* whichDirective = operativeDirective(
       m_workerSrc.get(), operativeDirective(m_childSrc.get()));
 
   return reportingStatus == ContentSecurityPolicy::SendReport
-             ? checkSourceAndReportViolation(
-                   whichDirective, url,
-                   ContentSecurityPolicy::DirectiveType::WorkerSrc,
-                   redirectStatus)
+             ? checkSourceAndReportViolation(whichDirective, url,
+                                             ContentSecurityPolicy::WorkerSrc,
+                                             redirectStatus)
              : checkSource(whichDirective, url, redirectStatus);
 }
 
 bool CSPDirectiveList::allowAncestors(
     LocalFrame* frame,
     const KURL& url,
     ContentSecurityPolicy::ReportingStatus reportingStatus) const {
   return reportingStatus == ContentSecurityPolicy::SendReport
              ? checkAncestorsAndReportViolation(m_frameAncestors.get(), frame,
                                                 url)
@@ skipping 212 matching lines @@
                                        const String& value,
                                        Member<CSPDirectiveType>& directive) {
   if (directive) {
     m_policy->reportDuplicateDirective(name);
     return;
   }
 
   // Remove frame-ancestors directives in meta policies, per
   // https://www.w3.org/TR/CSP2/#delivery-html-meta-element.
   if (m_headerSource == ContentSecurityPolicyHeaderSourceMeta &&
-      ContentSecurityPolicy::getDirectiveType(name) ==
-          ContentSecurityPolicy::DirectiveType::FrameAncestors) {
+      name == ContentSecurityPolicy::FrameAncestors) {
     m_policy->reportInvalidDirectiveInMeta(name);
     return;
   }
 
   directive = new CSPDirectiveType(name, value, m_policy);
 }
 
 void CSPDirectiveList::applySandboxPolicy(const String& name,
                                           const String& sandboxPolicy) {
   // Remove sandbox directives in meta policies, per
@@ skipping 64 matching lines @@
   m_upgradeInsecureRequests = true;
 
   m_policy->upgradeInsecureRequests();
   if (!value.isEmpty())
     m_policy->reportValueForEmptyDirective(name, value);
 }
 
 void CSPDirectiveList::addDirective(const String& name, const String& value) {
   ASSERT(!name.isEmpty());
 
-  ContentSecurityPolicy::DirectiveType type =
-      ContentSecurityPolicy::getDirectiveType(name);
-  if (type == ContentSecurityPolicy::DirectiveType::DefaultSrc) {
+  if (equalIgnoringCase(name, ContentSecurityPolicy::DefaultSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_defaultSrc);
     // TODO(mkwst) It seems unlikely that developers would use different
     // algorithms for scripts and styles. We may want to combine the
     // usesScriptHashAlgorithms() and usesStyleHashAlgorithms.
     m_policy->usesScriptHashAlgorithms(m_defaultSrc->hashAlgorithmsUsed());
     m_policy->usesStyleHashAlgorithms(m_defaultSrc->hashAlgorithmsUsed());
-  } else if (type == ContentSecurityPolicy::DirectiveType::ScriptSrc) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::ScriptSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_scriptSrc);
     m_policy->usesScriptHashAlgorithms(m_scriptSrc->hashAlgorithmsUsed());
-  } else if (type == ContentSecurityPolicy::DirectiveType::ObjectSrc) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::ObjectSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_objectSrc);
-  } else if (type ==
-
-             ContentSecurityPolicy::DirectiveType::FrameAncestors) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::FrameAncestors)) {
     setCSPDirective<SourceListDirective>(name, value, m_frameAncestors);
-  } else if (type == ContentSecurityPolicy::DirectiveType::FrameSrc) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::FrameSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_frameSrc);
-  } else if (type == ContentSecurityPolicy::DirectiveType::ImgSrc) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::ImgSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_imgSrc);
-  } else if (type == ContentSecurityPolicy::DirectiveType::StyleSrc) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::StyleSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_styleSrc);
     m_policy->usesStyleHashAlgorithms(m_styleSrc->hashAlgorithmsUsed());
-  } else if (type == ContentSecurityPolicy::DirectiveType::FontSrc) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::FontSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_fontSrc);
-  } else if (type == ContentSecurityPolicy::DirectiveType::MediaSrc) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::MediaSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_mediaSrc);
-  } else if (type == ContentSecurityPolicy::DirectiveType::ConnectSrc) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::ConnectSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_connectSrc);
-  } else if (type == ContentSecurityPolicy::DirectiveType::Sandbox) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::Sandbox)) {
     applySandboxPolicy(name, value);
-  } else if (type == ContentSecurityPolicy::DirectiveType::ReportURI) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::ReportURI)) {
     parseReportURI(name, value);
-  } else if (type == ContentSecurityPolicy::DirectiveType::BaseURI) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::BaseURI)) {
     setCSPDirective<SourceListDirective>(name, value, m_baseURI);
-  } else if (type == ContentSecurityPolicy::DirectiveType::ChildSrc) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::ChildSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_childSrc);
-  } else if (type == ContentSecurityPolicy::DirectiveType::WorkerSrc &&
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::WorkerSrc) &&
              m_policy->experimentalFeaturesEnabled()) {
     setCSPDirective<SourceListDirective>(name, value, m_workerSrc);
-  } else if (type == ContentSecurityPolicy::DirectiveType::FormAction) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::FormAction)) {
     setCSPDirective<SourceListDirective>(name, value, m_formAction);
-  } else if (type == ContentSecurityPolicy::DirectiveType::PluginTypes) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::PluginTypes)) {
     setCSPDirective<MediaListDirective>(name, value, m_pluginTypes);
-  } else if (type ==
-             ContentSecurityPolicy::DirectiveType::UpgradeInsecureRequests) {
+  } else if (equalIgnoringCase(
+                 name, ContentSecurityPolicy::UpgradeInsecureRequests)) {
     enableInsecureRequestsUpgrade(name, value);
-  } else if (type ==
-             ContentSecurityPolicy::DirectiveType::BlockAllMixedContent) {
+  } else if (equalIgnoringCase(name,
+                               ContentSecurityPolicy::BlockAllMixedContent)) {
     enforceStrictMixedContentChecking(name, value);
-  } else if (type == ContentSecurityPolicy::DirectiveType::ManifestSrc) {
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::ManifestSrc)) {
     setCSPDirective<SourceListDirective>(name, value, m_manifestSrc);
-  } else if (type ==
-             ContentSecurityPolicy::DirectiveType::TreatAsPublicAddress) {
+  } else if (equalIgnoringCase(name,
+                               ContentSecurityPolicy::TreatAsPublicAddress)) {
     treatAsPublicAddress(name, value);
-  } else if (type == ContentSecurityPolicy::DirectiveType::RequireSRIFor &&
+  } else if (equalIgnoringCase(name, ContentSecurityPolicy::RequireSRIFor) &&
              m_policy->experimentalFeaturesEnabled()) {
     parseRequireSRIFor(name, value);
   } else {
     m_policy->reportUnsupportedDirective(name);
   }
 }
 
 DEFINE_TRACE(CSPDirectiveList) {
   visitor->trace(m_policy);
   visitor->trace(m_pluginTypes);
   visitor->trace(m_baseURI);
   visitor->trace(m_childSrc);
   visitor->trace(m_connectSrc);
   visitor->trace(m_defaultSrc);
   visitor->trace(m_fontSrc);
   visitor->trace(m_formAction);
   visitor->trace(m_frameAncestors);
   visitor->trace(m_frameSrc);
   visitor->trace(m_imgSrc);
   visitor->trace(m_mediaSrc);
   visitor->trace(m_manifestSrc);
   visitor->trace(m_objectSrc);
   visitor->trace(m_scriptSrc);
   visitor->trace(m_styleSrc);
   visitor->trace(m_workerSrc);
 }
 
 }  // namespace blink