Use RequestContext to apply CSP in FrameFetchContext

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

Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
index d4f207be1c0ad75875ed4cc1f8081152a12f4e7e..f97ade3617b7863d411304956bf1a784fdd09c70 100644
--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
@@ -1055,31 +1055,6 @@ bool ContentSecurityPolicy::shouldBypassMainWorld(const ExecutionContext* contex
     return false;
 }
 
-bool ContentSecurityPolicy::isScriptResource(const ResourceRequest& resourceRequest)
-{
-    return WebURLRequest::RequestContextScript == resourceRequest.requestContext() || WebURLRequest::RequestContextImport == resourceRequest.requestContext() || WebURLRequest::RequestContextXSLT == resourceRequest.requestContext() || WebURLRequest::RequestContextPrefetch == resourceRequest.requestContext();
-}
-
-bool ContentSecurityPolicy::isStyleResource(const ResourceRequest& resourceRequest)
-{
-    return WebURLRequest::RequestContextStyle == resourceRequest.requestContext() || WebURLRequest::RequestContextPrefetch == resourceRequest.requestContext();
-}
-
-bool ContentSecurityPolicy::isImageResource(const ResourceRequest& resourceRequest)
-{
-    return WebURLRequest::RequestContextImage == resourceRequest.requestContext() || WebURLRequest::RequestContextFavicon == resourceRequest.requestContext() || WebURLRequest::RequestContextImageSet == resourceRequest.requestContext() || WebURLRequest::RequestContextPrefetch == resourceRequest.requestContext();
-}
-
-bool ContentSecurityPolicy::isFontResource(const ResourceRequest& resourceRequest)
-{
-    return WebURLRequest::RequestContextFont == resourceRequest.requestContext() || WebURLRequest::RequestContextPrefetch == resourceRequest.requestContext();
-}
-
-bool ContentSecurityPolicy::isMediaResource(const ResourceRequest& resourceRequest)
-{
-    return WebURLRequest::RequestContextAudio == resourceRequest.requestContext() || WebURLRequest::RequestContextVideo == resourceRequest.requestContext() || WebURLRequest::RequestContextTrack == resourceRequest.requestContext() || WebURLRequest::RequestContextPrefetch == resourceRequest.requestContext();
-}
-
 bool ContentSecurityPolicy::shouldSendViolationReport(const String& report) const
 {
     // Collisions have no security impact, so we can save space by storing only the string's hash rather than the whole report.