Loader: Narrow visibility of functions in BaseFetchContext for cleanup

For cleanup, this CL...

- moves BaseFetchContext::PrintAccessDeniedMessage() from 'protected' to
  'private', and
- inlines BaseFetchContext::AddCSPHeaderIfNecessary() in
  FrameFetchContext::PopulateResourceRequest().

Bug: 845285
Change-Id: Id16a9210cef284ddb814cf1ee4a2da81bb12f030
Reviewed-on: https://chromium-review.googlesource.com/1123978Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572119}

third_party/blink/renderer/core/loader/base_fetch_context.cc

@@ -210,15 +210,6 @@ void BaseFetchContext::PrintAccessDeniedMessage(const KURL& url) const {
                                            kErrorMessageLevel, message));
 }
 
-void BaseFetchContext::AddCSPHeaderIfNecessary(Resource::Type type,
-                                               ResourceRequest& request) {
-  const ContentSecurityPolicy* csp = GetContentSecurityPolicy();
-  if (!csp)
-    return;
-  if (csp->ShouldSendCSPHeader(type))
-    request.AddHTTPHeaderField("CSP", "active");
-}
-
 base::Optional<ResourceRequestBlockedReason>
 BaseFetchContext::CheckCSPForRequest(
     WebURLRequest::RequestContext request_context,

third_party/blink/renderer/core/loader/base_fetch_context.h

@@ -95,11 +95,9 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
 
   virtual void AddConsoleMessage(ConsoleMessage*) const = 0;
 
-  // Utility method that can be used to implement other methods.
+ private:
   void PrintAccessDeniedMessage(const KURL&) const;
-  void AddCSPHeaderIfNecessary(Resource::Type, ResourceRequest&);
 
- private:
   // Utility methods that are used in default implement for CanRequest,
   // CanFollowRedirect and AllowResponse.
   base::Optional<ResourceRequestBlockedReason> CanRequestInternal(

third_party/blink/renderer/core/loader/frame_fetch_context.cc

@@ -999,7 +999,10 @@ void FrameFetchContext::PopulateResourceRequest(
     ResourceRequest& request) {
   ModifyRequestForCSP(request);
   AddClientHintsIfNecessary(hints_preferences, resource_width, request);
-  AddCSPHeaderIfNecessary(type, request);
+
+  const ContentSecurityPolicy* csp = GetContentSecurityPolicy();
+  if (csp && csp->ShouldSendCSPHeader(type))
+    request.AddHTTPHeaderField("CSP", "active");
 }
 
 void FrameFetchContext::SetFirstPartyCookieAndRequestorOrigin(