Make prepareRequest() a separate callback of FetchContext

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

 /*
  * Copyright (C) 2010 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 235 matching lines @@
       m_corsMode(IsCORSEnabled) {
   const AtomicString contentType = request.httpContentType();
   if (!contentType.isNull() &&
       FetchUtils::isSimpleHeader(AtomicString("content-type"), contentType))
     m_corsMode = NotCORSEnabled;
 
   frame->loader().client()->didDispatchPingLoader(request.url());
 
   FetchContext& fetchContext = frame->document()->fetcher()->context();
 
-  fetchContext.willStartLoadingResource(
-      m_identifier, request, Resource::Image, initiator,
-      FetchContext::V8ActivityLoggingPolicy::Log);
+  fetchContext.prepareRequest(request,
+                              FetchContext::RedirectType::kNotForRedirect);
+  fetchContext.recordLoadingActivity(m_identifier, request, Resource::Image,
+                                     initiator);
 
   FetchInitiatorInfo initiatorInfo;
   initiatorInfo.name = initiator;
   fetchContext.dispatchWillSendRequest(m_identifier, request,
                                        ResourceResponse(), initiatorInfo);
 
   // Make sure the scheduler doesn't wait for the ping.
   if (frame->frameScheduler())
     frame->frameScheduler()->didStopLoading(m_identifier);
 
@@ skipping 56 matching lines @@
       return false;
     }
   }
   // FIXME: http://crbug.com/427429 is needed to correctly propagate updates of
   // Origin: following this successful redirect.
 
   if (frame() && frame()->document()) {
     FetchInitiatorInfo initiatorInfo;
     initiatorInfo.name = m_initiator;
     FetchContext& fetchContext = frame()->document()->fetcher()->context();
+    fetchContext.prepareRequest(passedNewRequest.toMutableResourceRequest(),
+                                FetchContext::RedirectType::kForRedirect);
     fetchContext.dispatchWillSendRequest(
         m_identifier, passedNewRequest.toMutableResourceRequest(),
         passedRedirectResponse.toResourceResponse(), initiatorInfo);
   }
 
   return true;
 }
 
 void PingLoaderImpl::didReceiveResponse(const WebURLResponse& response) {
   if (frame()) {
@@ skipping 219 matching lines @@
 bool PingLoader::sendBeacon(LocalFrame* frame,
                             int allowance,
                             const KURL& beaconURL,
                             Blob* data,
                             int& payloadLength) {
   BeaconBlob beacon(data);
   return sendBeaconCommon(frame, allowance, beaconURL, beacon, payloadLength);
 }
 
 }  // namespace blink