Use fetch_event_id (fetchEventID in blink) for FetchEvent

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 132 matching lines @@
       m_workerGlobalScope->getExecutionContext(), wrapUnique(handle.release()));
   WaitUntilObserver* observer = WaitUntilObserver::create(
       workerGlobalScope(), WaitUntilObserver::Message, eventID);
 
   Event* event =
       ExtendableMessageEvent::create(value, origin, ports, source, observer);
   workerGlobalScope()->dispatchExtendableEvent(event, observer);
 }
 
 void ServiceWorkerGlobalScopeProxy::dispatchFetchEvent(
-    int responseID,
-    int eventFinishID,
+    int fetchEventID,
     const WebServiceWorkerRequest& webRequest) {
   ScriptState::Scope scope(
       workerGlobalScope()->scriptController()->getScriptState());
   WaitUntilObserver* waitUntilObserver = WaitUntilObserver::create(
-      workerGlobalScope(), WaitUntilObserver::Fetch, eventFinishID);
+      workerGlobalScope(), WaitUntilObserver::Fetch, fetchEventID);
   RespondWithObserver* respondWithObserver = RespondWithObserver::create(
-      workerGlobalScope(), responseID, webRequest.url(), webRequest.mode(),
+      workerGlobalScope(), fetchEventID, webRequest.url(), webRequest.mode(),
       webRequest.frameType(), webRequest.requestContext(), waitUntilObserver);
   Request* request = Request::create(
       workerGlobalScope()->scriptController()->getScriptState(), webRequest);
   request->getHeaders()->setGuard(Headers::ImmutableGuard);
   FetchEventInit eventInit;
   eventInit.setCancelable(true);
   eventInit.setRequest(request);
   eventInit.setClientId(
       webRequest.isMainResourceLoad() ? WebString() : webRequest.clientId());
   eventInit.setIsReload(webRequest.isReload());
   FetchEvent* fetchEvent = FetchEvent::create(
       workerGlobalScope()->scriptController()->getScriptState(),
       EventTypeNames::fetch, eventInit, respondWithObserver, waitUntilObserver);
   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::dispatchForeignFetchEvent(
-    int responseID,
-    int eventFinishID,
+    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. We can check it in the browser process if
     // the service worker is installed after M56. But if the service worker was
     // installed in old version of Chrome (< M56) we have to check it in the
     // renderer process (here).
     ServiceWorkerGlobalScopeClient::from(workerGlobalScope())
-        ->respondToFetchEvent(responseID, WTF::currentTime());
+        ->respondToFetchEvent(fetchEventID, WTF::currentTime());
     ServiceWorkerGlobalScopeClient::from(workerGlobalScope())
-        ->didHandleFetchEvent(eventFinishID,
+        ->didHandleFetchEvent(fetchEventID,
                               WebServiceWorkerEventResultCompleted,
                               WTF::currentTime());
     return;
   }
 
   ScriptState::Scope scope(
       workerGlobalScope()->scriptController()->getScriptState());
   RefPtr<SecurityOrigin> origin =
       SecurityOrigin::create(webRequest.referrerUrl());
   WaitUntilObserver* waitUntilObserver = WaitUntilObserver::create(
-      workerGlobalScope(), WaitUntilObserver::Fetch, eventFinishID);
+      workerGlobalScope(), WaitUntilObserver::Fetch, fetchEventID);
   ForeignFetchRespondWithObserver* respondWithObserver =
       ForeignFetchRespondWithObserver::create(
-          workerGlobalScope(), responseID, webRequest.url(), webRequest.mode(),
-          webRequest.frameType(), webRequest.requestContext(), origin,
-          waitUntilObserver);
+          workerGlobalScope(), fetchEventID, webRequest.url(),
+          webRequest.mode(), webRequest.frameType(),
+          webRequest.requestContext(), origin, waitUntilObserver);
   Request* request = Request::create(
       workerGlobalScope()->scriptController()->getScriptState(), webRequest);
   request->getHeaders()->setGuard(Headers::ImmutableGuard);
   ForeignFetchEventInit eventInit;
   eventInit.setCancelable(true);
   eventInit.setRequest(request);
   eventInit.setOrigin(origin->toString());
   ForeignFetchEvent* fetchEvent = ForeignFetchEvent::create(
       workerGlobalScope()->scriptController()->getScriptState(),
       EventTypeNames::foreignfetch, eventInit, respondWithObserver,
@@ skipping 183 matching lines @@
   return *m_document;
 }
 
 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope()
     const {
   DCHECK(m_workerGlobalScope);
   return m_workerGlobalScope;
 }
 
 }  // namespace blink