Revert of Show service worker navigation preload requests in DevTools Network tab

third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp

Index: third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
index 47c84b43aba67e20c17acbf471df5c540bad2169..bb8ce8603553c733ba1e455ce9316211cfe24529 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
@@ -577,8 +577,8 @@ void InspectorNetworkAgent::didBlockRequest(
     const FetchInitiatorInfo& initiatorInfo,
     ResourceRequestBlockedReason reason) {
   unsigned long identifier = createUniqueIdentifier();
-  willSendRequestInternal(identifier, loader, request, ResourceResponse(),
-                          initiatorInfo);
+  willSendRequestInternal(frame, identifier, loader, request,
+                          ResourceResponse(), initiatorInfo);
 
   String requestId = IdentifiersFactory::requestId(identifier);
   String protocolReason = buildBlockedReason(reason);
@@ -598,13 +598,14 @@ void InspectorNetworkAgent::didChangeResourcePriority(
 }
 
 void InspectorNetworkAgent::willSendRequestInternal(
+    LocalFrame* frame,
     unsigned long identifier,
     DocumentLoader* loader,
     const ResourceRequest& request,
     const ResourceResponse& redirectResponse,
     const FetchInitiatorInfo& initiatorInfo) {
   String requestId = IdentifiersFactory::requestId(identifier);
-  String loaderId = loader ? IdentifiersFactory::loaderId(loader) : "";
+  String loaderId = IdentifiersFactory::loaderId(loader);
   m_resourcesData->resourceCreated(requestId, loaderId, request.url());
 
   InspectorPageAgent::ResourceType type = InspectorPageAgent::OtherResource;
@@ -616,20 +617,11 @@ void InspectorNetworkAgent::willSendRequestInternal(
     m_resourcesData->setResourceType(requestId, type);
   }
 
-  String frameId = loader && loader->frame()
-                       ? IdentifiersFactory::frameId(loader->frame())
-                       : "";
-  std::unique_ptr<protocol::Network::Initiator> initiatorObject;
-  if (loader) {
-    initiatorObject = buildInitiatorObject(
-        loader->frame() ? loader->frame()->document() : 0, initiatorInfo);
-  } else {
-    initiatorObject =
-        protocol::Network::Initiator::create()
-            .setType(protocol::Network::Initiator::TypeEnum::Preload)
-            .build();
-  }
-
+  String frameId =
+      loader->frame() ? IdentifiersFactory::frameId(loader->frame()) : "";
+  std::unique_ptr<protocol::Network::Initiator> initiatorObject =
+      buildInitiatorObject(loader->frame() ? loader->frame()->document() : 0,
+                           initiatorInfo);
   if (initiatorInfo.name == FetchInitiatorTypeNames::document) {
     FrameNavigationInitiatorMap::iterator it =
         m_frameNavigationInitiatorMap.find(frameId);
@@ -640,26 +632,23 @@ void InspectorNetworkAgent::willSendRequestInternal(
   std::unique_ptr<protocol::Network::Request> requestInfo(
       buildObjectForResourceRequest(request));
 
-  if (loader) {
-    requestInfo->setMixedContentType(mixedContentTypeForContextType(
-        MixedContentChecker::contextTypeForInspector(loader->frame(),
-                                                     request)));
-  }
+  requestInfo->setMixedContentType(mixedContentTypeForContextType(
+      MixedContentChecker::contextTypeForInspector(frame, request)));
 
   requestInfo->setReferrerPolicy(referrerPolicy(request.getReferrerPolicy()));
 
   String resourceType = InspectorPageAgent::resourceTypeJson(type);
   frontend()->requestWillBeSent(
       requestId, frameId, loaderId,
-      loader ? urlWithoutFragment(loader->url()).getString() : "",
-      std::move(requestInfo), monotonicallyIncreasingTime(), currentTime(),
-      std::move(initiatorObject),
+      urlWithoutFragment(loader->url()).getString(), std::move(requestInfo),
+      monotonicallyIncreasingTime(), currentTime(), std::move(initiatorObject),
       buildObjectForResourceResponse(redirectResponse), resourceType);
   if (m_pendingXHRReplayData && !m_pendingXHRReplayData->async())
     frontend()->flush();
 }
 
 void InspectorNetworkAgent::willSendRequest(
+    LocalFrame* frame,
     unsigned long identifier,
     DocumentLoader* loader,
     ResourceRequest& request,
@@ -699,7 +688,7 @@ void InspectorNetworkAgent::willSendRequest(
   if (m_state->booleanProperty(NetworkAgentState::bypassServiceWorker, false))
     request.setSkipServiceWorker(WebURLRequest::SkipServiceWorker::All);
 
-  willSendRequestInternal(identifier, loader, request, redirectResponse,
+  willSendRequestInternal(frame, identifier, loader, request, redirectResponse,
                           initiatorInfo);
 
   if (!m_hostId.isEmpty())
@@ -713,7 +702,7 @@ void InspectorNetworkAgent::markResourceAsCached(unsigned long identifier) {
 }
 
 void InspectorNetworkAgent::didReceiveResourceResponse(
-    ExecutionContext* context,
+    LocalFrame* frame,
     unsigned long identifier,
     DocumentLoader* loader,
     const ResourceResponse& response,
@@ -749,10 +738,7 @@ void InspectorNetworkAgent::didReceiveResourceResponse(
   // doesn't affect Resource lifetime.
   if (cachedResource)
     m_resourcesData->addResource(requestId, cachedResource);
-  String frameId =
-      context->isDocument()
-          ? IdentifiersFactory::frameId(toDocument(context)->frame())
-          : "";
+  String frameId = IdentifiersFactory::frameId(frame);
   String loaderId = loader ? IdentifiersFactory::loaderId(loader) : "";
   m_resourcesData->responseReceived(requestId, frameId, response);
   m_resourcesData->setResourceType(requestId, type);
@@ -775,14 +761,15 @@ void InspectorNetworkAgent::didReceiveResourceResponse(
   // following didReceiveResponse as there will be no calls to didReceiveData
   // from the network stack.
   if (isNotModified && cachedResource && cachedResource->encodedSize())
-    didReceiveData(identifier, 0, cachedResource->encodedSize());
+    didReceiveData(frame, identifier, 0, cachedResource->encodedSize());
 }
 
 static bool isErrorStatusCode(int statusCode) {
   return statusCode >= 400;
 }
 
-void InspectorNetworkAgent::didReceiveData(unsigned long identifier,
+void InspectorNetworkAgent::didReceiveData(LocalFrame*,
+                                           unsigned long identifier,
                                            const char* data,
                                            int dataLength) {
   String requestId = IdentifiersFactory::requestId(identifier);
@@ -847,8 +834,7 @@ void InspectorNetworkAgent::didReceiveCORSRedirectResponse(
     const ResourceResponse& response,
     Resource* resource) {
   // Update the response and finish loading
-  didReceiveResourceResponse(frame->document(), identifier, loader, response,
-                             resource);
+  didReceiveResourceResponse(frame, identifier, loader, response, resource);
   didFinishLoading(identifier, 0,
                    WebURLLoaderClient::kUnknownEncodedDataLength);
 }
@@ -935,10 +921,9 @@ void InspectorNetworkAgent::willLoadXHR(XMLHttpRequest* xhr,
 void InspectorNetworkAgent::delayedRemoveReplayXHR(XMLHttpRequest* xhr) {
   if (!m_replayXHRs.contains(xhr))
     return;
-  DCHECK(m_removeFinishedReplayXHRTimer);
   m_replayXHRsToBeDeleted.insert(xhr);
   m_replayXHRs.remove(xhr);
-  m_removeFinishedReplayXHRTimer->startOneShot(0, BLINK_FROM_HERE);
+  m_removeFinishedReplayXHRTimer.startOneShot(0, BLINK_FROM_HERE);
 }
 
 void InspectorNetworkAgent::didFailXHRLoading(ExecutionContext* context,
@@ -1546,13 +1531,10 @@ InspectorNetworkAgent::InspectorNetworkAgent(InspectedFrames* inspectedFrames)
       m_pendingRequest(nullptr),
       m_isRecalculatingStyle(false),
       m_removeFinishedReplayXHRTimer(
-          inspectedFrames
-              ? new TaskRunnerTimer<InspectorNetworkAgent>(
-                    TaskRunnerHelper::get(TaskType::UnspecedLoading,
-                                          inspectedFrames->root()),
-                    this,
-                    &InspectorNetworkAgent::removeFinishedReplayXHRFired)
-              : nullptr) {}
+          TaskRunnerHelper::get(TaskType::UnspecedLoading,
+                                inspectedFrames->root()),
+          this,
+          &InspectorNetworkAgent::removeFinishedReplayXHRFired) {}
 
 bool InspectorNetworkAgent::shouldForceCORSPreflight() {
   return m_state->booleanProperty(NetworkAgentState::cacheDisabled, false);