Delay generation of User-Agent header to URLRequestHttpJob and accept custom User-Agent from XHR/Fe…

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 162 matching lines @@
     if (m_documentLoader)
         frame = m_documentLoader->frame();
     else if (m_document && m_document->importsController())
         frame = m_document->importsController()->master()->frame();
     ASSERT(frame);
     return frame;
 }
 
 void FrameFetchContext::addAdditionalRequestHeaders(ResourceRequest& request, FetchResourceType type)
 {
-    bool isMainResource = type == FetchMainResource;
-    if (!isMainResource) {
+    if (type != FetchMainResource) {
         RefPtr<SecurityOrigin> outgoingOrigin;
         if (!request.didSetHTTPReferrer()) {
             ASSERT(m_document);
             outgoingOrigin = m_document->getSecurityOrigin();
             request.setHTTPReferrer(SecurityPolicy::generateReferrer(m_document->getReferrerPolicy(), request.url(), m_document->outgoingReferrer()));
         } else {
             RELEASE_ASSERT(SecurityPolicy::generateReferrer(request.getReferrerPolicy(), request.url(), request.httpReferrer()).referrer == request.httpReferrer());
             outgoingOrigin = SecurityOrigin::createFromString(request.httpReferrer());
         }
 
         request.addHTTPOriginIfNeeded(outgoingOrigin);
     }
 
     if (m_document)
         request.setExternalRequestStateFromRequestorAddressSpace(m_document->addressSpace());
 
     // The remaining modifications are only necessary for HTTP and HTTPS.
     if (!request.url().isEmpty() && !request.url().protocolIsInHTTPFamily())
         return;
 
     if (frame()->loader().loadType() == FrameLoadTypeReload)
         request.clearHTTPHeaderField("Save-Data");
 
     if (frame()->settings() && frame()->settings()->dataSaverEnabled())
         request.setHTTPHeaderField("Save-Data", "on");
 
-    frame()->loader().applyUserAgent(request);
+    request.setDefaultHTTPUserAgent(AtomicString(frame()->loader().userAgent()));
 }
 
 CachePolicy FrameFetchContext::getCachePolicy() const
 {
     if (m_document && m_document->loadEventFinished())
         return CachePolicyVerify;
 
     FrameLoadType loadType = frame()->loader().loadType();
     if (loadType == FrameLoadTypeReloadBypassingCache)
         return CachePolicyReload;
@@ skipping 93 matching lines @@
 
 void FrameFetchContext::dispatchDidChangeResourcePriority(unsigned long identifier, ResourceLoadPriority loadPriority, int intraPriorityValue)
 {
     frame()->loader().client()->dispatchDidChangeResourcePriority(identifier, loadPriority, intraPriorityValue);
     TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceChangePriority", TRACE_EVENT_SCOPE_THREAD, "data", InspectorChangeResourcePriorityEvent::data(identifier, loadPriority));
     InspectorInstrumentation::didChangeResourcePriority(frame(), identifier, loadPriority);
 }
 
 void FrameFetchContext::prepareRequest(unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
 {
-    frame()->loader().applyUserAgent(request);
+    request.setDefaultHTTPUserAgent(AtomicString(frame()->loader().userAgent()));
     frame()->loader().client()->dispatchWillSendRequest(m_documentLoader, identifier, request, redirectResponse);
 }
 
 void FrameFetchContext::dispatchWillSendRequest(unsigned long identifier, 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);
@@ skipping 499 matching lines @@
 }
 
 DEFINE_TRACE(FrameFetchContext)
 {
     visitor->trace(m_document);
     visitor->trace(m_documentLoader);
     FetchContext::trace(visitor);
 }
 
 } // namespace blink