Use fetch_event_id (fetchEventID in blink) for FetchEvent

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp

Index: third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
diff --git a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
index c28fcbe3e055dabba994a1fb3bb3e940044ecd19..995bfa237f9e63dd531e665268667f5a7313db6c 100644
--- a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
+++ b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
@@ -150,15 +150,14 @@ void ServiceWorkerGlobalScopeProxy::dispatchExtendableMessageEvent(
 }
 
 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);
@@ -183,8 +182,7 @@ void ServiceWorkerGlobalScopeProxy::dispatchFetchEvent(
 }
 
 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
@@ -193,9 +191,9 @@ void ServiceWorkerGlobalScopeProxy::dispatchForeignFetchEvent(
     // 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;
@@ -206,12 +204,12 @@ void ServiceWorkerGlobalScopeProxy::dispatchForeignFetchEvent(
   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);