Refactor mutable ResourceRequest in ResourceFetcher

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

Index: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
index 8a426c03f2d5c0286c9a46202907cf964cb8a89e..d3f26dae53cd0089b095dca67cbc0d37777890cd 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
@@ -463,7 +463,6 @@ ResourceFetcher::PrepareRequestResult ResourceFetcher::prepareRequest(
     const SubstituteData& substituteData,
     unsigned long identifier,
     ResourceRequestBlockedReason& blockedReason) {
-  ResourceRequest& resourceRequest = request.mutableResourceRequest();
 
   DCHECK(request.options().synchronousPolicy == RequestAsynchronously ||
          factory.type() == Resource::Raw ||
@@ -471,20 +470,21 @@ ResourceFetcher::PrepareRequestResult ResourceFetcher::prepareRequest(
 
   context().populateResourceRequest(
       factory.type(), request.clientHintsPreferences(),
-      request.getResourceWidth(), resourceRequest);
+      request.getResourceWidth(), request.mutableResourceRequest());
 
   if (!request.url().isValid())
     return Abort;
 
-  resourceRequest.setPriority(computeLoadPriority(
+  request.mutableResourceRequest().setPriority(computeLoadPriority(
       factory.type(), request.resourceRequest(), ResourcePriority::NotVisible,
       request.defer(), request.isSpeculativePreload()));
-  initializeResourceRequest(resourceRequest, factory.type(), request.defer());
-  network_instrumentation::resourcePrioritySet(identifier,
-                                               resourceRequest.priority());
+  initializeResourceRequest(request.mutableResourceRequest(), factory.type(),
+                            request.defer());
+  network_instrumentation::resourcePrioritySet(
+      identifier, request.resourceRequest().priority());
 
   blockedReason = context().canRequest(
-      factory.type(), resourceRequest,
+      factory.type(), request.resourceRequest(),
       MemoryCache::removeFragmentIdentifierIfNeeded(request.url()),
       request.options(),
       /* Don't send security violation reports for speculative preloads */
@@ -498,7 +498,7 @@ ResourceFetcher::PrepareRequestResult ResourceFetcher::prepareRequest(
   }
 
   context().willStartLoadingResource(
-      identifier, resourceRequest, factory.type(),
+      identifier, request.mutableResourceRequest(), factory.type(),
       request.options().initiatorInfo.name,
       (request.isSpeculativePreload()
            ? FetchContext::V8ActivityLoggingPolicy::SuppressLogging
@@ -506,7 +506,7 @@ ResourceFetcher::PrepareRequestResult ResourceFetcher::prepareRequest(
   if (!request.url().isValid())
     return Abort;
 
-  resourceRequest.setAllowStoredCredentials(
+  request.mutableResourceRequest().setAllowStoredCredentials(
       request.options().allowCredentials == AllowStoredCredentials);
   return Continue;
 }
@@ -516,9 +516,8 @@ Resource* ResourceFetcher::requestResource(
     const ResourceFactory& factory,
     const SubstituteData& substituteData) {
   unsigned long identifier = createUniqueIdentifier();
-  ResourceRequest& resourceRequest = request.mutableResourceRequest();
   network_instrumentation::ScopedResourceLoadTracker scopedResourceLoadTracker(
-      identifier, resourceRequest);
+      identifier, request.resourceRequest());
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Fetch.RequestResourceTime");
   // TODO(dproy): Remove this. http://crbug.com/659666
   TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url",
@@ -535,7 +534,7 @@ Resource* ResourceFetcher::requestResource(
   if (result == Block)
     return resourceForBlockedRequest(request, factory, blockedReason);
 
-  bool isDataUrl = resourceRequest.url().protocolIsData();
+  bool isDataUrl = request.url().protocolIsData();
   bool isStaticData = isDataUrl || substituteData.isValid() || m_archive;
   if (isStaticData) {
     resource = resourceForStaticData(request, factory, substituteData);
@@ -570,7 +569,7 @@ Resource* ResourceFetcher::requestResource(
       resource = createResourceForLoading(request, request.charset(), factory);
       break;
     case Revalidate:
-      initializeRevalidation(resourceRequest, resource);
+      initializeRevalidation(request.mutableResourceRequest(), resource);
       break;
     case Use:
       if (resource->isLinkPreload() && !request.isLinkPreload())
@@ -598,8 +597,9 @@ Resource* ResourceFetcher::requestResource(
     // promotions. This can happen when a visible image's priority is increased
     // and then another reference to the image is parsed (which would be at a
     // lower priority).
-    if (resourceRequest.priority() > resource->resourceRequest().priority())
-      resource->didChangePriority(resourceRequest.priority(), 0);
+    if (request.resourceRequest().priority() >
+        resource->resourceRequest().priority())
+      resource->didChangePriority(request.resourceRequest().priority(), 0);
     // TODO(yoav): I'd expect the stated scenario to not go here, as its policy
     // would be Use.
   }