Split header modification out of willSendRequest

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

Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index b62fe6436b012a3c7e15efae9ce5961b2492a63a..68bbc93d075357020e367b4ec0b968cf40674f1d 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -421,22 +421,19 @@ void FrameFetchContext::dispatchDidChangeResourcePriority(
   probe::didChangeResourcePriority(frame(), identifier, loadPriority);
 }
 
-void FrameFetchContext::prepareRequest(ResourceRequest& request) {
+void FrameFetchContext::prepareRequest(unsigned long identifier,
+                                       ResourceRequest& request) {
   frame()->loader().applyUserAgent(request);
   localFrameClient()->dispatchWillSendRequest(request);
+  probe::prepareRequest(frame(), identifier, request);
 }
 
 void FrameFetchContext::dispatchWillSendRequest(
     unsigned long identifier,
-    ResourceRequest& request,
+    const ResourceRequest& request,
     const ResourceResponse& redirectResponse,
     const FetchInitiatorInfo& initiatorInfo) {
-  // For initial requests, prepareRequest() is called in
-  // willStartLoadingResource(), before revalidation policy is determined. That
-  // call doesn't exist for redirects, so call preareRequest() here.
-  if (!redirectResponse.isNull()) {
-    prepareRequest(request);
-  } else {
+  if (redirectResponse.isNull()) {
     frame()->loader().progress().willStartLoading(identifier,
                                                   request.priority());
   }
@@ -559,7 +556,6 @@ void FrameFetchContext::willStartLoadingResource(
   TRACE_EVENT_ASYNC_BEGIN1(
       "blink.net", "Resource", identifier, "data",
       loadResourceTraceData(identifier, request.url(), request.priority()));
-  prepareRequest(request);
 
   if (!m_documentLoader || m_documentLoader->fetcher()->archive() ||
       !request.url().isValid())