Reland: [SWOnionSoup] Move dispatch_fetch_event_params.mojom into Blink

This is a reland CL for the reverted CL
https://chromium-review.googlesource.com/c/chromium/src/+/1113203

On top of the original CL, this CL updates module name of
dispatch_fetch_event_params.mojom from content.mojom to blink.mojom.

BUG=789846

Change-Id: I650ffaf9b862c75a553b2174bcc10eefe27f43ed
Reviewed-on: https://chromium-review.googlesource.com/1114392
Commit-Queue: Han Leon <leon.han@intel.com>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570346}

content/browser/service_worker/embedded_worker_test_helper.cc

@@ -229,7 +229,7 @@ class EmbeddedWorkerTestHelper::MockServiceWorkerEventDispatcher
   }
 
   void DispatchFetchEvent(
-      mojom::DispatchFetchEventParamsPtr params,
+      blink::mojom::DispatchFetchEventParamsPtr params,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       DispatchFetchEventCallback callback) override {
     if (!helper_)
@@ -594,7 +594,7 @@ void EmbeddedWorkerTestHelper::OnInstallEvent(
 void EmbeddedWorkerTestHelper::OnFetchEvent(
     int /* embedded_worker_id */,
     const network::ResourceRequest& /* request */,
-    mojom::FetchEventPreloadHandlePtr /* preload_handle */,
+    blink::mojom::FetchEventPreloadHandlePtr /* preload_handle */,
     mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
     mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
         finish_callback) {
@@ -907,7 +907,7 @@ void EmbeddedWorkerTestHelper::OnInstallEventStub(
 void EmbeddedWorkerTestHelper::OnFetchEventStub(
     int embedded_worker_id,
     const network::ResourceRequest& request,
-    mojom::FetchEventPreloadHandlePtr preload_handle,
+    blink::mojom::FetchEventPreloadHandlePtr preload_handle,
     mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
     mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
         finish_callback) {

content/browser/service_worker/embedded_worker_test_helper.h

@@ -205,7 +205,7 @@ class EmbeddedWorkerTestHelper {
   virtual void OnFetchEvent(
       int embedded_worker_id,
       const network::ResourceRequest& request,
-      mojom::FetchEventPreloadHandlePtr preload_handle,
+      blink::mojom::FetchEventPreloadHandlePtr preload_handle,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
           finish_callback);
@@ -311,7 +311,7 @@ class EmbeddedWorkerTestHelper {
   void OnFetchEventStub(
       int embedded_worker_id,
       const network::ResourceRequest& request,
-      mojom::FetchEventPreloadHandlePtr preload_handle,
+      blink::mojom::FetchEventPreloadHandlePtr preload_handle,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
           finish_callback);

content/browser/service_worker/service_worker_fetch_dispatcher.cc

@@ -607,7 +607,7 @@ void ServiceWorkerFetchDispatcher::DispatchFetchEvent() {
   }
 
   // Dispatch the fetch event.
-  auto params = mojom::DispatchFetchEventParams::New();
+  auto params = blink::mojom::DispatchFetchEventParams::New();
   params->request = *request_;
   params->request_body_blob_uuid = request_body_blob_uuid_;
   params->request_body_blob_size = request_body_blob_size_;
@@ -736,7 +736,7 @@ bool ServiceWorkerFetchDispatcher::MaybeStartNavigationPreload(
   const int request_id = ResourceDispatcherHostImpl::Get()->MakeRequestID();
   DCHECK_LT(request_id, -1);
 
-  preload_handle_ = mojom::FetchEventPreloadHandle::New();
+  preload_handle_ = blink::mojom::FetchEventPreloadHandle::New();
   network::mojom::URLLoaderClientPtr url_loader_client_ptr;
   preload_handle_->url_loader_client_request =
       mojo::MakeRequest(&url_loader_client_ptr);
@@ -796,7 +796,7 @@ bool ServiceWorkerFetchDispatcher::MaybeStartNavigationPreloadWithURLLoader(
       "Service-Worker-Navigation-Preload",
       version_->navigation_preload_state().header);
 
-  preload_handle_ = mojom::FetchEventPreloadHandle::New();
+  preload_handle_ = blink::mojom::FetchEventPreloadHandle::New();
 
   // Create the DelegatingURLLoaderClient, which becomes the
   // URLLoaderClient for the navigation preload network request.

content/browser/service_worker/service_worker_fetch_dispatcher.h

@@ -141,7 +141,7 @@ class CONTENT_EXPORT ServiceWorkerFetchDispatcher {
   // |preload_handle_| holds the URLLoader and URLLoaderClient for the service
   // worker to receive the navigation preload response. It's passed to the
   // service worker along with the fetch event.
-  mojom::FetchEventPreloadHandlePtr preload_handle_;
+  blink::mojom::FetchEventPreloadHandlePtr preload_handle_;
 
   base::WeakPtrFactory<ServiceWorkerFetchDispatcher> weak_factory_;
 

content/browser/service_worker/service_worker_navigation_loader_unittest.cc

@@ -70,7 +70,7 @@ class NavigationPreloadLoaderClient final
     : public network::mojom::URLLoaderClient {
  public:
   NavigationPreloadLoaderClient(
-      mojom::FetchEventPreloadHandlePtr preload_handle,
+      blink::mojom::FetchEventPreloadHandlePtr preload_handle,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
           finish_callback)
@@ -288,7 +288,7 @@ class Helper : public EmbeddedWorkerTestHelper {
   void OnFetchEvent(
       int embedded_worker_id,
       const network::ResourceRequest& request,
-      mojom::FetchEventPreloadHandlePtr preload_handle,
+      blink::mojom::FetchEventPreloadHandlePtr preload_handle,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
           finish_callback) override {

content/browser/service_worker/service_worker_url_request_job_unittest.cc

@@ -518,7 +518,7 @@ class DelayHelper : public EmbeddedWorkerTestHelper {
   void OnFetchEvent(
       int embedded_worker_id,
       const network::ResourceRequest& /* request */,
-      mojom::FetchEventPreloadHandlePtr preload_handle,
+      blink::mojom::FetchEventPreloadHandlePtr preload_handle,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
           finish_callback) override {
@@ -541,7 +541,7 @@ class DelayHelper : public EmbeddedWorkerTestHelper {
   blink::mojom::ServiceWorkerInstalledScriptsInfoPtr installed_scripts_info_;
   int embedded_worker_id_ = 0;
   mojom::ServiceWorkerFetchResponseCallbackPtr response_callback_;
-  mojom::FetchEventPreloadHandlePtr preload_handle_;
+  blink::mojom::FetchEventPreloadHandlePtr preload_handle_;
   mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
       finish_callback_;
   ServiceWorkerURLRequestJobTest* test_;
@@ -696,7 +696,7 @@ class ProviderDeleteHelper : public EmbeddedWorkerTestHelper {
   void OnFetchEvent(
       int /* embedded_worker_id */,
       const network::ResourceRequest& /* request */,
-      mojom::FetchEventPreloadHandlePtr /* preload_handle */,
+      blink::mojom::FetchEventPreloadHandlePtr /* preload_handle */,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
           finish_callback) override {
@@ -786,7 +786,7 @@ class BlobResponder : public EmbeddedWorkerTestHelper {
   void OnFetchEvent(
       int /* embedded_worker_id */,
       const network::ResourceRequest& /* request */,
-      mojom::FetchEventPreloadHandlePtr /* preload_handle */,
+      blink::mojom::FetchEventPreloadHandlePtr /* preload_handle */,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
           finish_callback) override {
@@ -887,7 +887,7 @@ class StreamResponder : public EmbeddedWorkerTestHelper {
   void OnFetchEvent(
       int /* embedded_worker_id */,
       const network::ResourceRequest& /* request */,
-      mojom::FetchEventPreloadHandlePtr /* preload_handle */,
+      blink::mojom::FetchEventPreloadHandlePtr /* preload_handle */,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
           finish_callback) override {
@@ -1277,7 +1277,7 @@ class FailFetchHelper : public EmbeddedWorkerTestHelper {
   void OnFetchEvent(
       int embedded_worker_id,
       const network::ResourceRequest& /* request */,
-      mojom::FetchEventPreloadHandlePtr /* preload_handle */,
+      blink::mojom::FetchEventPreloadHandlePtr /* preload_handle */,
       mojom::ServiceWorkerFetchResponseCallbackPtr /* response_callback */,
       mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
           finish_callback) override {
@@ -1370,7 +1370,7 @@ class EarlyResponseHelper : public EmbeddedWorkerTestHelper {
   void OnFetchEvent(
       int /* embedded_worker_id */,
       const network::ResourceRequest& /* request */,
-      mojom::FetchEventPreloadHandlePtr /* preload_handle */,
+      blink::mojom::FetchEventPreloadHandlePtr /* preload_handle */,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       mojom::ServiceWorkerEventDispatcher::DispatchFetchEventCallback
           finish_callback) override {

content/common/BUILD.gn

@@ -557,7 +557,6 @@ mojom("mojo_bindings") {
     "renderer.mojom",
     "renderer_host.mojom",
     "service_worker/controller_service_worker.mojom",
-    "service_worker/dispatch_fetch_event_params.mojom",
     "service_worker/embedded_worker.mojom",
     "service_worker/service_worker.mojom",
     "service_worker/service_worker_container.mojom",

content/common/service_worker/controller_service_worker.mojom

@@ -4,11 +4,11 @@
 
 module content.mojom;
 
-import "content/common/service_worker/dispatch_fetch_event_params.mojom";
 import "content/common/service_worker/service_worker_event_dispatcher.mojom";
 import "content/common/service_worker/service_worker_fetch_response_callback.mojom";
 import "mojo/public/mojom/base/time.mojom";
 import "services/network/public/mojom/url_loader.mojom";
+import "third_party/blink/public/mojom/service_worker/dispatch_fetch_event_params.mojom";
 import "third_party/blink/public/mojom/service_worker/service_worker_event_status.mojom";
 import "third_party/blink/public/mojom/service_worker/service_worker_object.mojom";
 import "third_party/blink/public/platform/modules/fetch/fetch_api_request.mojom";
@@ -38,7 +38,7 @@ interface ControllerServiceWorker {
   // handler ran and all outstanding respondWith() and waitUntil() promises have
   // settled. |response_callback| is called once the promise to respondWith()
   // settles, or when the event handler ran without calling respondWith().
-  DispatchFetchEvent(DispatchFetchEventParams params,
+  DispatchFetchEvent(blink.mojom.DispatchFetchEventParams params,
                      ServiceWorkerFetchResponseCallback response_callback)
       => (blink.mojom.ServiceWorkerEventStatus status,
           mojo_base.mojom.Time dispatch_event_time);

content/common/service_worker/service_worker_event_dispatcher.mojom

@@ -4,7 +4,6 @@
 
 module content.mojom;
 
-import "content/common/service_worker/dispatch_fetch_event_params.mojom";
 import "content/common/service_worker/service_worker_fetch_response_callback.mojom";
 import "mojo/public/mojom/base/string16.mojom";
 import "mojo/public/mojom/base/time.mojom";
@@ -12,6 +11,7 @@ import "services/network/public/mojom/cookie_manager.mojom";
 import "third_party/blink/public/platform/modules/fetch/fetch_api_request.mojom";
 import "third_party/blink/public/platform/modules/payments/payment_app.mojom";
 import "third_party/blink/public/mojom/message_port/message_port.mojom";
+import "third_party/blink/public/mojom/service_worker/dispatch_fetch_event_params.mojom";
 import "third_party/blink/public/mojom/service_worker/service_worker.mojom";
 import "third_party/blink/public/mojom/service_worker/service_worker_client.mojom";
 import "third_party/blink/public/mojom/service_worker/service_worker_event_status.mojom";
@@ -125,7 +125,7 @@ interface ServiceWorkerEventDispatcher {
   // waitUntil() promises have settled. |response_callback| is called once the
   // promise to respondWith() settles, or when the event handler ran without
   // calling respondWith().
-  DispatchFetchEvent(DispatchFetchEventParams params,
+  DispatchFetchEvent(blink.mojom.DispatchFetchEventParams params,
                      ServiceWorkerFetchResponseCallback response_callback)
       => (blink.mojom.ServiceWorkerEventStatus status,
           mojo_base.mojom.Time dispatch_event_time);

content/renderer/service_worker/controller_service_worker_impl.cc

@@ -25,7 +25,7 @@ void ControllerServiceWorkerImpl::Clone(
 }
 
 void ControllerServiceWorkerImpl::DispatchFetchEvent(
-    mojom::DispatchFetchEventParamsPtr params,
+    blink::mojom::DispatchFetchEventParamsPtr params,
     mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
     DispatchFetchEventCallback callback) {
   DCHECK(context_client_);

content/renderer/service_worker/controller_service_worker_impl.h

@@ -39,7 +39,7 @@ class ControllerServiceWorkerImpl : public mojom::ControllerServiceWorker {
 
   // mojom::ControllerServiceWorker:
   void DispatchFetchEvent(
-      mojom::DispatchFetchEventParamsPtr params,
+      blink::mojom::DispatchFetchEventParamsPtr params,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       DispatchFetchEventCallback callback) override;
   void Clone(mojom::ControllerServiceWorkerRequest request) override;

content/renderer/service_worker/service_worker_context_client.cc

@@ -542,9 +542,10 @@ struct ServiceWorkerContextClient::WorkerContextData {
 class ServiceWorkerContextClient::NavigationPreloadRequest final
     : public network::mojom::URLLoaderClient {
  public:
-  NavigationPreloadRequest(int fetch_event_id,
-                           const GURL& url,
-                           mojom::FetchEventPreloadHandlePtr preload_handle)
+  NavigationPreloadRequest(
+      int fetch_event_id,
+      const GURL& url,
+      blink::mojom::FetchEventPreloadHandlePtr preload_handle)
       : fetch_event_id_(fetch_event_id),
         url_(url),
         url_loader_(std::move(preload_handle->url_loader)),
@@ -1382,7 +1383,7 @@ void ServiceWorkerContextClient::Claim(
 }
 
 void ServiceWorkerContextClient::DispatchOrQueueFetchEvent(
-    mojom::DispatchFetchEventParamsPtr params,
+    blink::mojom::DispatchFetchEventParamsPtr params,
     mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
     DispatchFetchEventCallback callback) {
   TRACE_EVENT2("ServiceWorker",
@@ -1652,7 +1653,7 @@ void ServiceWorkerContextClient::DispatchExtendableMessageEvent(
 
 // S13nServiceWorker
 void ServiceWorkerContextClient::DispatchFetchEvent(
-    mojom::DispatchFetchEventParamsPtr params,
+    blink::mojom::DispatchFetchEventParamsPtr params,
     mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
     DispatchFetchEventCallback callback) {
   int event_id = context_->timeout_timer->StartEvent(
@@ -1819,7 +1820,7 @@ void ServiceWorkerContextClient::OnNavigationPreloadComplete(
 void ServiceWorkerContextClient::SetupNavigationPreload(
     int fetch_event_id,
     const GURL& url,
-    mojom::FetchEventPreloadHandlePtr preload_handle) {
+    blink::mojom::FetchEventPreloadHandlePtr preload_handle) {
   auto preload_request = std::make_unique<NavigationPreloadRequest>(
       fetch_event_id, url, std::move(preload_handle));
   context_->preload_requests.AddWithID(std::move(preload_request),

content/renderer/service_worker/service_worker_context_client.h

@@ -251,7 +251,7 @@ class CONTENT_EXPORT ServiceWorkerContextClient
   // This method needs to be used only if the event comes directly from a
   // client, which means it is coming through the ControllerServiceWorkerImpl.
   void DispatchOrQueueFetchEvent(
-      mojom::DispatchFetchEventParamsPtr params,
+      blink::mojom::DispatchFetchEventParamsPtr params,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       DispatchFetchEventCallback callback);
 
@@ -307,7 +307,7 @@ class CONTENT_EXPORT ServiceWorkerContextClient
       mojom::ExtendableMessageEventPtr event,
       DispatchExtendableMessageEventCallback callback) override;
   void DispatchFetchEvent(
-      mojom::DispatchFetchEventParamsPtr params,
+      blink::mojom::DispatchFetchEventParamsPtr params,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       DispatchFetchEventCallback callback) override;
   void DispatchNotificationClickEvent(
@@ -381,9 +381,10 @@ class CONTENT_EXPORT ServiceWorkerContextClient
       int fetch_event_id,
       std::unique_ptr<blink::WebServiceWorkerError> error);
 
-  void SetupNavigationPreload(int fetch_event_id,
-                              const GURL& url,
-                              mojom::FetchEventPreloadHandlePtr preload_handle);
+  void SetupNavigationPreload(
+      int fetch_event_id,
+      const GURL& url,
+      blink::mojom::FetchEventPreloadHandlePtr preload_handle);
 
   // Called by ServiceWorkerTimeoutTimer when a certain time has passed since
   // the last task finished.

content/renderer/service_worker/service_worker_context_client_unittest.cc

@@ -343,7 +343,7 @@ TEST_F(ServiceWorkerContextClientTest, DispatchFetchEvent) {
   request->url = expected_url;
   mojom::ServiceWorkerFetchResponseCallbackPtr fetch_callback_ptr;
   fetch_callback_request = mojo::MakeRequest(&fetch_callback_ptr);
-  auto params = mojom::DispatchFetchEventParams::New();
+  auto params = blink::mojom::DispatchFetchEventParams::New();
   params->request = *request;
   pipes.event_dispatcher->DispatchFetchEvent(
       std::move(params), std::move(fetch_callback_ptr),
@@ -380,7 +380,7 @@ TEST_F(ServiceWorkerContextClientTest,
       mojo::MakeRequest(&fetch_callback_ptr);
   auto request = std::make_unique<network::ResourceRequest>();
   request->url = expected_url;
-  auto params = mojom::DispatchFetchEventParams::New();
+  auto params = blink::mojom::DispatchFetchEventParams::New();
   params->request = *request;
   context_client->DispatchOrQueueFetchEvent(
       std::move(params), std::move(fetch_callback_ptr),
@@ -428,7 +428,7 @@ TEST_F(ServiceWorkerContextClientTest,
     fetch_callback_request = mojo::MakeRequest(&fetch_callback_ptr);
     auto request = std::make_unique<network::ResourceRequest>();
     request->url = expected_url;
-    auto params = mojom::DispatchFetchEventParams::New();
+    auto params = blink::mojom::DispatchFetchEventParams::New();
     params->request = *request;
     pipes.controller->DispatchFetchEvent(
         std::move(params), std::move(fetch_callback_ptr),
@@ -477,7 +477,7 @@ TEST_F(ServiceWorkerContextClientTest,
     fetch_callback_request_1 = mojo::MakeRequest(&fetch_callback_ptr);
     auto request = std::make_unique<network::ResourceRequest>();
     request->url = expected_url_1;
-    auto params = mojom::DispatchFetchEventParams::New();
+    auto params = blink::mojom::DispatchFetchEventParams::New();
     params->request = *request;
     pipes.controller->DispatchFetchEvent(
         std::move(params), std::move(fetch_callback_ptr),
@@ -494,7 +494,7 @@ TEST_F(ServiceWorkerContextClientTest,
     fetch_callback_request_2 = mojo::MakeRequest(&fetch_callback_ptr);
     auto request = std::make_unique<network::ResourceRequest>();
     request->url = expected_url_2;
-    auto params = mojom::DispatchFetchEventParams::New();
+    auto params = blink::mojom::DispatchFetchEventParams::New();
     params->request = *request;
     pipes.event_dispatcher->DispatchFetchEvent(
         std::move(params), std::move(fetch_callback_ptr),

content/renderer/service_worker/service_worker_provider_context_unittest.cc

@@ -229,7 +229,7 @@ class FakeControllerServiceWorker : public mojom::ControllerServiceWorker {
 
   // mojom::ControllerServiceWorker:
   void DispatchFetchEvent(
-      mojom::DispatchFetchEventParamsPtr params,
+      blink::mojom::DispatchFetchEventParamsPtr params,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       DispatchFetchEventCallback callback) override {
     fetch_event_count_++;

content/renderer/service_worker/service_worker_subresource_loader.cc

@@ -25,6 +25,7 @@
 #include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "third_party/blink/public/mojom/blob/blob.mojom.h"
+#include "third_party/blink/public/mojom/service_worker/dispatch_fetch_event_params.mojom.h"
 #include "third_party/blink/public/platform/interface_provider.h"
 #include "third_party/blink/public/platform/modules/serviceworker/web_service_worker_request.h"
 #include "third_party/blink/public/platform/web_http_body.h"
@@ -229,7 +230,7 @@ void ServiceWorkerSubresourceLoader::DispatchFetchEvent() {
     return;
   }
 
-  auto params = mojom::DispatchFetchEventParams::New();
+  auto params = blink::mojom::DispatchFetchEventParams::New();
   params->request = resource_request_;
   params->client_id = controller_connector_->client_id();
 

content/renderer/service_worker/service_worker_subresource_loader.h

@@ -11,7 +11,6 @@
 #include "base/scoped_observer.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
-#include "content/common/service_worker/dispatch_fetch_event_params.mojom.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "content/renderer/service_worker/controller_service_worker_connector.h"
 #include "mojo/public/cpp/bindings/binding.h"

content/renderer/service_worker/service_worker_subresource_loader_unittest.cc

@@ -185,7 +185,7 @@ class FakeControllerServiceWorker : public mojom::ControllerServiceWorker {
 
   // mojom::ControllerServiceWorker:
   void DispatchFetchEvent(
-      mojom::DispatchFetchEventParamsPtr params,
+      blink::mojom::DispatchFetchEventParamsPtr params,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       DispatchFetchEventCallback callback) override {
     EXPECT_FALSE(ServiceWorkerUtils::IsMainResourceType(

third_party/blink/public/mojom/BUILD.gn

@@ -36,6 +36,7 @@ mojom("mojom_platform") {
     "plugins/plugin_registry.mojom",
     "quota/quota_dispatcher_host.mojom",
     "quota/quota_types.mojom",
+    "service_worker/dispatch_fetch_event_params.mojom",
     "service_worker/navigation_preload_state.mojom",
     "service_worker/service_worker_client.mojom",
     "service_worker/service_worker_error_type.mojom",

content/common/service_worker/dispatch_fetch_event_params.mojom → third_party/blink/public/mojom/service_worker/dispatch_fetch_event_params.mojom

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-module content.mojom;
+module blink.mojom;
 
 import "services/network/public/mojom/url_loader.mojom";
 import "third_party/blink/public/mojom/blob/blob.mojom";
@@ -31,14 +31,14 @@ struct DispatchFetchEventParams {
   // |request.request_body|. These BlobPtrs need to be passed separately.
   // Once the NetworkService is enabled, this will be no longer used since all
   // Blobs are passed as data pipes which can live in |request.request_body|.
-  array<blink.mojom.Blob> request_body_blob_ptrs;
+  array<Blob> request_body_blob_ptrs;
 
   // (C) non-S13nServiceWorker:
   // All information to create the request body are packed into a blob. These
   // params are for passing the blob.
   string request_body_blob_uuid;
   uint64 request_body_blob_size;
-  blink.mojom.Blob? request_body_blob;
+  Blob? request_body_blob;
 
   // FetchEvent#clientId.
   string client_id;