service worker: Move service_worker.mojom to service_worker_provider.mojom.

The mojom only has the ServiceWorkerDispatcherHost interface now, which
is about service worker providers.

Preparation for moving service_worker_event_dispatcher.mojom to
service_worker.mojom. This might make the git history more sensible.

Bug: 629701
Change-Id: I89693e40ad0d4c259233fb2b805519f432b483ec
Reviewed-on: https://chromium-review.googlesource.com/1142860Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576391}

content/browser/service_worker/service_worker_dispatcher_host.h

@@ -9,7 +9,7 @@
 
 #include "base/macros.h"
 #include "content/common/content_export.h"
-#include "content/common/service_worker/service_worker.mojom.h"
+#include "content/common/service_worker/service_worker_provider.mojom.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host_observer.h"

content/common/BUILD.gn

@@ -553,7 +553,6 @@ mojom("mojo_bindings") {
     "renderer_host.mojom",
     "service_worker/controller_service_worker.mojom",
     "service_worker/embedded_worker.mojom",
-    "service_worker/service_worker.mojom",
     "service_worker/service_worker_container.mojom",
     "service_worker/service_worker_event_dispatcher.mojom",
     "service_worker/service_worker_fetch_response_callback.mojom",

content/common/service_worker/service_worker.mojom

-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module content.mojom;
-
-import "content/common/service_worker/service_worker_provider.mojom";
-
-// Per-process browser-side interface.
-// The renderer uses this interface to tell the browser when potential service
-// worker clients are created and when service workers are starting up.
-interface ServiceWorkerDispatcherHost {
-  // Creates a content::ServiceWorkerProviderHost on the browser
-  // process. |provider_info| has Mojo endpoints to connect the container host
-  // and the container on the renderer together. The lifetime of
-  // ServiceWorkerProviderHost will be tied to the
-  // mojom::ServiceWorkerContainerHost interface.
-  OnProviderCreated(ServiceWorkerProviderHostInfo provider_info);
-};

content/common/service_worker/service_worker_provider.mojom

@@ -123,3 +123,15 @@ interface ServiceWorkerWorkerClientRegistry {
   // Clones this host.
   CloneWorkerClientRegistry(ServiceWorkerWorkerClientRegistry& host);
 };
+
+// Per-process browser-side interface.
+// The renderer uses this interface to tell the browser when potential service
+// worker clients are created and when service workers are starting up.
+interface ServiceWorkerDispatcherHost {
+  // Creates a content::ServiceWorkerProviderHost on the browser
+  // process. |provider_info| has Mojo endpoints to connect the container host
+  // and the container on the renderer together. The lifetime of
+  // ServiceWorkerProviderHost will be tied to the
+  // mojom::ServiceWorkerContainerHost interface.
+  OnProviderCreated(ServiceWorkerProviderHostInfo provider_info);
+};

content/renderer/service_worker/service_worker_network_provider.h

@@ -16,7 +16,6 @@
 #include "base/supports_user_data.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/controller_service_worker.mojom.h"
-#include "content/common/service_worker/service_worker.mojom.h"
 #include "content/common/service_worker/service_worker_provider.mojom.h"
 #include "content/renderer/service_worker/service_worker_provider_context.h"
 #include "third_party/blink/public/mojom/service_worker/service_worker_provider_type.mojom.h"