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 f873f582a862959088feae2731098e1add6b3b7e..4ecf5fcca4167845872aa09042ea7ea75c75536e 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -302,15 +302,11 @@ void FrameFetchContext::prepareRequest(unsigned long identifier, ResourceRequest
 {
     frame()->loader().applyUserAgent(request);
     frame()->loader().client()->dispatchWillSendRequest(m_documentLoader, identifier, request, redirectResponse);
+    InspectorInstrumentation::prepareRequest(frame(), masterDocumentLoader(), request);
 }
 
-void FrameFetchContext::dispatchWillSendRequest(unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse, const FetchInitiatorInfo& initiatorInfo)
+void FrameFetchContext::dispatchWillSendRequest(unsigned long identifier, 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(identifier, request, redirectResponse);
     TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceSendRequest", TRACE_EVENT_SCOPE_THREAD, "data", InspectorSendRequestEvent::data(identifier, frame(), request));
     InspectorInstrumentation::willSendRequest(frame(), identifier, masterDocumentLoader(), request, redirectResponse, initiatorInfo);
     if (frame()->frameScheduler())
@@ -400,7 +396,6 @@ void FrameFetchContext::willStartLoadingResource(unsigned long identifier, Resou
 {
     TRACE_EVENT_ASYNC_BEGIN1("blink.net", "Resource", identifier, "data", loadResourceTraceData(identifier, request.url(), request.priority()));
     frame()->loader().progress().willStartLoading(identifier);
-    prepareRequest(identifier, request, ResourceResponse());
 
     if (!m_documentLoader || m_documentLoader->fetcher()->archive() || !request.url().isValid())
         return;