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

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.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 19 matching lines @@
 
 #include "web/ServiceWorkerGlobalScopeProxy.h"
 
 #include "bindings/core/v8/SourceLocation.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/MessagePort.h"
 #include "core/inspector/ConsoleMessage.h"
-#include "core/inspector/InspectorInstrumentation.h"
 #include "core/origin_trials/OriginTrials.h"
 #include "core/workers/ParentFrameTaskRunners.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThread.h"
 #include "modules/background_sync/SyncEvent.h"
 #include "modules/fetch/Headers.h"
 #include "modules/notifications/Notification.h"
 #include "modules/notifications/NotificationEvent.h"
 #include "modules/notifications/NotificationEventInit.h"
 #include "modules/payments/PaymentAppRequestData.h"
 #include "modules/payments/PaymentAppRequestDataConversion.h"
 #include "modules/payments/PaymentRequestEvent.h"
 #include "modules/push_messaging/PushEvent.h"
 #include "modules/push_messaging/PushMessageData.h"
 #include "modules/serviceworkers/ExtendableEvent.h"
 #include "modules/serviceworkers/ExtendableMessageEvent.h"
 #include "modules/serviceworkers/FetchEvent.h"
 #include "modules/serviceworkers/ForeignFetchEvent.h"
 #include "modules/serviceworkers/InstallEvent.h"
 #include "modules/serviceworkers/ServiceWorkerClient.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScope.h"
 #include "modules/serviceworkers/ServiceWorkerWindowClient.h"
 #include "modules/serviceworkers/WaitUntilObserver.h"
 #include "platform/RuntimeEnabledFeatures.h"
-#include "platform/network/ResourceError.h"
 #include "public/platform/modules/notifications/WebNotificationData.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerEventResult.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerRequest.h"
 #include "public/web/WebSerializedScriptValue.h"
 #include "public/web/modules/serviceworker/WebServiceWorkerContextClient.h"
 #include "web/WebEmbeddedWorkerImpl.h"
 #include "wtf/Assertions.h"
-#include "wtf/CurrentTime.h"
 #include "wtf/Functional.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 #include <utility>
 
 namespace blink {
 
 ServiceWorkerGlobalScopeProxy* ServiceWorkerGlobalScopeProxy::create(
     WebEmbeddedWorkerImpl& embeddedWorker,
     Document& document,
@@ skipping 109 matching lines @@
   waitUntilObserver->willDispatchEvent();
   respondWithObserver->willDispatchEvent();
   DispatchEventResult dispatchResult =
       workerGlobalScope()->dispatchEvent(fetchEvent);
   respondWithObserver->didDispatchEvent(dispatchResult);
   // false is okay because waitUntil for fetch event doesn't care about the
   // promise rejection or an uncaught runtime script error.
   waitUntilObserver->didDispatchEvent(false /* errorOccurred */);
 }
 
-void ServiceWorkerGlobalScopeProxy::onNavigationPreloadSent(int fetchEventID,
-                                                            const WebURL& url) {
-  FetchInitiatorInfo info;
-  ResourceRequest request(url);
-  InspectorInstrumentation::willSendRequest(workerGlobalScope(), fetchEventID,
-                                            nullptr, request,
-                                            ResourceResponse(), info);
-}
-
 void ServiceWorkerGlobalScopeProxy::onNavigationPreloadResponse(
     int fetchEventID,
     std::unique_ptr<WebURLResponse> response,
     std::unique_ptr<WebDataConsumerHandle> dataConsumeHandle) {
-  InspectorInstrumentation::didReceiveResourceResponse(
-      workerGlobalScope(), fetchEventID, nullptr,
-      response->toResourceResponse(), nullptr);
   FetchEvent* fetchEvent = m_pendingPreloadFetchEvents.take(fetchEventID);
   DCHECK(fetchEvent);
   fetchEvent->onNavigationPreloadResponse(
       workerGlobalScope()->scriptController()->getScriptState(),
       std::move(response), std::move(dataConsumeHandle));
 }
 
 void ServiceWorkerGlobalScopeProxy::onNavigationPreloadError(
     int fetchEventID,
     std::unique_ptr<WebServiceWorkerError> error) {
-  InspectorInstrumentation::didFailLoading(
-      workerGlobalScope(), fetchEventID,
-      ResourceError(errorDomainBlinkInternal, 0, "", error->message));
-
   FetchEvent* fetchEvent = m_pendingPreloadFetchEvents.take(fetchEventID);
   // This method may be called after onNavigationPreloadResponse() was called.
   if (!fetchEvent)
     return;
   fetchEvent->onNavigationPreloadError(
       workerGlobalScope()->scriptController()->getScriptState(),
       std::move(error));
 }
 
-void ServiceWorkerGlobalScopeProxy::onNavigationPreloadCompleted(
-    int fetchEventID,
-    int64_t encodedDataLength) {
-  InspectorInstrumentation::didFinishLoading(workerGlobalScope(), fetchEventID,
-                                             monotonicallyIncreasingTime(),
-                                             encodedDataLength);
-}
-
 void ServiceWorkerGlobalScopeProxy::dispatchForeignFetchEvent(
     int fetchEventID,
     const WebServiceWorkerRequest& webRequest) {
   if (!OriginTrials::foreignFetchEnabled(workerGlobalScope())) {
     // If origin trial tokens have expired, or are otherwise no longer valid
     // no events should be dispatched.
     // TODO(mek): Ideally the browser wouldn't even start the service worker
     // if its tokens have expired.
     ServiceWorkerGlobalScopeClient::from(workerGlobalScope())
         ->respondToFetchEvent(fetchEventID, WTF::currentTime());
@@ skipping 255 matching lines @@
   return *m_document;
 }
 
 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope()
     const {
   DCHECK(m_workerGlobalScope);
   return m_workerGlobalScope;
 }
 
 }  // namespace blink