Remove FetchRequest::mutableResourceRequest() where removing is trivial

This CL removes FetchRequest::mutableResourceRequest() calls that are
used to modify ResourceRequest created just before, i.e. replaces:
  FetchRequest request(ResourceRequest(foo), bar);
  request.mutableResourceRequest().baz();
with:
  ResourceRequest resourceRequest(foo);
  resourceRequest.baz();
  FetchRequest request(resourceRequest, bar);
To clarify what kind of modifications to ResourceRequest via
mutableResourceRequest() is needed (https://crbug.com/632580#c8).

BUG=632580

Review-Url: https://codereview.chromium.org/2740253002
Cr-Commit-Position: refs/heads/master@{#456169}

third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp

@@ -89,16 +89,15 @@ static void setCrossOriginAccessControl(FetchRequest& request,
 
 FontResource* CSSFontFaceSrcValue::fetch(Document* document) const {
   if (!m_fetched) {
-    FetchRequest request(ResourceRequest(m_absoluteResource),
-                         FetchInitiatorTypeNames::css);
+    ResourceRequest resourceRequest(m_absoluteResource);
+    resourceRequest.setHTTPReferrer(SecurityPolicy::generateReferrer(
+        m_referrer.referrerPolicy, resourceRequest.url(), m_referrer.referrer));
+    FetchRequest request(resourceRequest, FetchInitiatorTypeNames::css);
     if (RuntimeEnabledFeatures::webFontsCacheAwareTimeoutAdaptationEnabled())
       request.setCacheAwareLoadingEnabled(IsCacheAwareLoadingEnabled);
     request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);
     SecurityOrigin* securityOrigin = document->getSecurityOrigin();
     setCrossOriginAccessControl(request, securityOrigin);
-    request.mutableResourceRequest().setHTTPReferrer(
-        SecurityPolicy::generateReferrer(m_referrer.referrerPolicy,
-                                         request.url(), m_referrer.referrer));
     FontResource* resource = FontResource::fetch(request, document->fetcher());
     if (!resource)
       return nullptr;

third_party/WebKit/Source/core/css/CSSImageSetValue.cpp

@@ -110,9 +110,9 @@ StyleImage* CSSImageSetValue::cacheImage(
     // Page::pageScaleFactor(), LocalFrame::pageZoomFactor(), and any CSS
     // transforms. https://bugs.webkit.org/show_bug.cgi?id=81698
     ImageWithScale image = bestImageForScaleFactor(deviceScaleFactor);
-    FetchRequest request(ResourceRequest(document.completeURL(image.imageURL)),
-                         FetchInitiatorTypeNames::css);
-    request.mutableResourceRequest().setHTTPReferrer(image.referrer);
+    ResourceRequest resourceRequest(document.completeURL(image.imageURL));
+    resourceRequest.setHTTPReferrer(image.referrer);
+    FetchRequest request(resourceRequest, FetchInitiatorTypeNames::css);
 
     if (crossOrigin != CrossOriginAttributeNotSet)
       request.setCrossOriginAccessControl(document.getSecurityOrigin(),

third_party/WebKit/Source/core/css/CSSImageValue.cpp

@@ -55,13 +55,12 @@ StyleImage* CSSImageValue::cacheImage(const Document& document,
   if (!m_cachedImage) {
     if (m_absoluteURL.isEmpty())
       reResolveURL(document);
-    FetchRequest request(ResourceRequest(m_absoluteURL),
-                         m_initiatorName.isEmpty()
-                             ? FetchInitiatorTypeNames::css
-                             : m_initiatorName);
-    request.mutableResourceRequest().setHTTPReferrer(
-        SecurityPolicy::generateReferrer(m_referrer.referrerPolicy,
-                                         request.url(), m_referrer.referrer));
+    ResourceRequest resourceRequest(m_absoluteURL);
+    resourceRequest.setHTTPReferrer(SecurityPolicy::generateReferrer(
+        m_referrer.referrerPolicy, resourceRequest.url(), m_referrer.referrer));
+    FetchRequest request(resourceRequest, m_initiatorName.isEmpty()
+                                              ? FetchInitiatorTypeNames::css
+                                              : m_initiatorName);
 
     if (crossOrigin != CrossOriginAttributeNotSet)
       request.setCrossOriginAccessControl(document.getSecurityOrigin(),

third_party/WebKit/Source/core/dom/ScriptLoader.cpp

@@ -523,9 +523,17 @@ bool ScriptLoader::fetchScript(const String& sourceUrl,
   // 21. "If the element has a src content attribute, run these substeps:"
   if (!stripLeadingAndTrailingHTMLSpaces(sourceUrl).isEmpty()) {
     // 21.4. "Parse src relative to the element's node document."
-    FetchRequest request(
-        ResourceRequest(elementDocument->completeURL(sourceUrl)),
-        m_element->localName());
+    ResourceRequest resourceRequest(elementDocument->completeURL(sourceUrl));
+
+    // [Intervention]
+    if (m_documentWriteIntervention ==
+        DocumentWriteIntervention::FetchDocWrittenScriptDeferIdle) {
+      resourceRequest.setHTTPHeaderField(
+          "Intervention",
+          "<https://www.chromestatus.com/feature/5718547946799104>");
+    }
+
+    FetchRequest request(resourceRequest, m_element->localName());
 
     // 15. "Let CORS setting be the current state of the element's
     //      crossorigin content attribute."
@@ -570,14 +578,6 @@ bool ScriptLoader::fetchScript(const String& sourceUrl,
       request.setIntegrityMetadata(metadataSet);
     }
 
-    // [Intervention]
-    if (m_documentWriteIntervention ==
-        DocumentWriteIntervention::FetchDocWrittenScriptDeferIdle) {
-      request.mutableResourceRequest().setHTTPHeaderField(
-          "Intervention",
-          "<https://www.chromestatus.com/feature/5718547946799104>");
-    }
-
     // 21.6. "Switch on the script's type:"
 
     // - "classic":

third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp

@@ -141,10 +141,9 @@ void InspectorResourceContentLoader::start() {
       if (url.isEmpty() || urlsToFetch.contains(url))
         continue;
       urlsToFetch.insert(url);
-      FetchRequest request(ResourceRequest(url),
-                           FetchInitiatorTypeNames::internal);
-      request.mutableResourceRequest().setRequestContext(
-          WebURLRequest::RequestContextInternal);
+      ResourceRequest resourceRequest(url);
+      resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal);
+      FetchRequest request(resourceRequest, FetchInitiatorTypeNames::internal);
       Resource* resource =
           CSSStyleSheetResource::fetch(request, document->fetcher());
       if (!resource)

third_party/WebKit/Source/core/loader/LinkLoader.cpp

@@ -354,13 +354,13 @@ static Resource* prefetchIfNeeded(Document& document,
   if (relAttribute.isLinkPrefetch() && href.isValid() && document.frame()) {
     UseCounter::count(document, UseCounter::LinkRelPrefetch);
 
-    FetchRequest linkRequest(ResourceRequest(document.completeURL(href)),
-                             FetchInitiatorTypeNames::link);
+    ResourceRequest resourceRequest(document.completeURL(href));
     if (referrerPolicy != ReferrerPolicyDefault) {
-      linkRequest.mutableResourceRequest().setHTTPReferrer(
-          SecurityPolicy::generateReferrer(referrerPolicy, href,
-                                           document.outgoingReferrer()));
+      resourceRequest.setHTTPReferrer(SecurityPolicy::generateReferrer(
+          referrerPolicy, href, document.outgoingReferrer()));
     }
+
+    FetchRequest linkRequest(resourceRequest, FetchInitiatorTypeNames::link);
     if (crossOrigin != CrossOriginAttributeNotSet) {
       linkRequest.setCrossOriginAccessControl(document.getSecurityOrigin(),
                                               crossOrigin);

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcherTest.cpp

@@ -267,9 +267,9 @@ class RequestSameResourceOnComplete
     MockFetchContext* context =
         MockFetchContext::create(MockFetchContext::kShouldLoadNewResource);
     ResourceFetcher* fetcher2 = ResourceFetcher::create(context);
-    FetchRequest fetchRequest2(m_resource->url(), FetchInitiatorInfo());
-    fetchRequest2.mutableResourceRequest().setCachePolicy(
-        WebCachePolicy::ValidatingCacheData);
+    ResourceRequest resourceRequest2(m_resource->url());
+    resourceRequest2.setCachePolicy(WebCachePolicy::ValidatingCacheData);
+    FetchRequest fetchRequest2(resourceRequest2, FetchInitiatorInfo());
     Resource* resource2 = MockResource::fetch(fetchRequest2, fetcher2);
     EXPECT_EQ(m_resource, resource2);
     m_notifyFinishedCalled = true;