Removing CSPSourceList level up to SourceListDirective.

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

 /*
  * Copyright (C) 2011 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 23 matching lines @@
 #include "core/dom/SandboxFlags.h"
 #include "core/events/EventQueue.h"
 #include "core/events/SecurityPolicyViolationEvent.h"
 #include "core/fetch/IntegrityMetadata.h"
 #include "core/frame/FrameClient.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/csp/CSPDirectiveList.h"
 #include "core/frame/csp/CSPSource.h"
-#include "core/frame/csp/CSPSourceList.h"
 #include "core/frame/csp/MediaListDirective.h"
 #include "core/frame/csp/SourceListDirective.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/PingLoader.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/json/JSONValues.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
@@ skipping 549 matching lines @@
 
 template <bool (CSPDirectiveList::*allowed)(const CSPHashValue&,
                                             ContentSecurityPolicy::InlineType)
               const>
 bool checkDigest(const String& source,
                  ContentSecurityPolicy::InlineType type,
                  uint8_t hashAlgorithmsUsed,
                  const CSPDirectiveListVector& policies) {
   // Any additions or subtractions from this struct should also modify the
   // respective entries in the kSupportedPrefixes array in
-  // CSPSourceList::parseHash().
+  // SourceListDirective::parseHash().
   static const struct {
     ContentSecurityPolicyHashAlgorithm cspHashAlgorithm;
     HashAlgorithm algorithm;
   } kAlgorithmMap[] = {
       {ContentSecurityPolicyHashAlgorithmSha1, HashAlgorithmSha1},
       {ContentSecurityPolicyHashAlgorithmSha256, HashAlgorithmSha256},
       {ContentSecurityPolicyHashAlgorithmSha384, HashAlgorithmSha384},
       {ContentSecurityPolicyHashAlgorithmSha512, HashAlgorithmSha512}};
 
   // Only bother normalizing the source/computing digests if there are any
@@ skipping 871 matching lines @@
   // Collisions have no security impact, so we can save space by storing only
   // the string's hash rather than the whole report.
   return !m_violationReportsSent.contains(report.impl()->hash());
 }
 
 void ContentSecurityPolicy::didSendViolationReport(const String& report) {
   m_violationReportsSent.add(report.impl()->hash());
 }
 
 }  // namespace blink