Make prepareRequest() a separate callback of FetchContext

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

Index: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
index 596adba64d86b8a6775002e2e350284ecd05409c..27cacaeec1acb8524d186339f8ec5fea16f2903a 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
@@ -506,12 +506,11 @@ ResourceFetcher::PrepareRequestResult ResourceFetcher::prepareRequest(
     return Block;
   }
 
-  context().willStartLoadingResource(
-      identifier, resourceRequest, factory.type(),
-      request.options().initiatorInfo.name,
-      (request.isSpeculativePreload()
-           ? FetchContext::V8ActivityLoggingPolicy::SuppressLogging
-           : FetchContext::V8ActivityLoggingPolicy::Log));
+  // For initial requests, call prepareRequest() here before revalidation
+  // policy is determined.
+  context().prepareRequest(resourceRequest,
+                           FetchContext::RedirectType::kNotForRedirect);
+
   if (!request.url().isValid())
     return Abort;
 
@@ -544,6 +543,12 @@ Resource* ResourceFetcher::requestResource(
   if (result == Block)
     return resourceForBlockedRequest(request, factory, blockedReason);
 
+  if (!request.isSpeculativePreload()) {
+    // Only log if it's not for speculative preload.
+    context().recordLoadingActivity(identifier, resourceRequest, factory.type(),
+                                    request.options().initiatorInfo.name);
+  }
+
   bool isDataUrl = resourceRequest.url().protocolIsData();
   bool isStaticData = isDataUrl || substituteData.isValid() || m_archive;
   if (isStaticData) {