Split header modification out of willSendRequest

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 403 matching lines @@
 void FrameFetchContext::dispatchDidChangeResourcePriority(
     unsigned long identifier,
     ResourceLoadPriority loadPriority,
     int intraPriorityValue) {
   TRACE_EVENT1(
       "devtools.timeline", "ResourceChangePriority", "data",
       InspectorChangeResourcePriorityEvent::data(identifier, loadPriority));
   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());
   }
   probe::willSendRequest(frame(), identifier, masterDocumentLoader(), request,
                          redirectResponse, initiatorInfo);
   if (frame()->frameScheduler())
     frame()->frameScheduler()->didStartLoading(identifier);
 }
 
 void FrameFetchContext::dispatchDidReceiveResponse(
@@ skipping 102 matching lines @@
 
 void FrameFetchContext::willStartLoadingResource(
     unsigned long identifier,
     ResourceRequest& request,
     Resource::Type type,
     const AtomicString& fetchInitiatorName,
     V8ActivityLoggingPolicy loggingPolicy) {
   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())
     return;
   if (type == Resource::MainResource) {
     m_documentLoader->applicationCacheHost()->willStartLoadingMainResource(
         request);
   } else {
     m_documentLoader->applicationCacheHost()->willStartLoadingResource(request);
   }
@@ skipping 481 matching lines @@
                                                     response);
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->trace(m_document);
   visitor->trace(m_documentLoader);
   FetchContext::trace(visitor);
 }
 
 }  // namespace blink