Worker: Move shared_worker_info.mojom from content/ to blink/ (Onion Soup)

Change-Id: Ieb3f3b689f266d0d6c88824accd31a752dd66cbe
Bug: 911415
Reviewed-on: https://chromium-review.googlesource.com/c/1360036
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#614284}

content/browser/worker_host/mock_shared_worker.cc

@@ -97,7 +97,7 @@ bool MockSharedWorkerFactory::CheckReceivedCreateSharedWorker(
 }
 
 void MockSharedWorkerFactory::CreateSharedWorker(
-    mojom::SharedWorkerInfoPtr info,
+    blink::mojom::SharedWorkerInfoPtr info,
     bool pause_on_start,
     const base::UnguessableToken& devtools_worker_token,
     const RendererPreferences& renderer_preferences,

content/browser/worker_host/mock_shared_worker.h

@@ -66,7 +66,7 @@ class MockSharedWorkerFactory : public mojom::SharedWorkerFactory {
  private:
   // mojom::SharedWorkerFactory methods:
   void CreateSharedWorker(
-      mojom::SharedWorkerInfoPtr info,
+      blink::mojom::SharedWorkerInfoPtr info,
       bool pause_on_start,
       const base::UnguessableToken& devtools_worker_token,
       const RendererPreferences& renderer_preferences,
@@ -87,7 +87,7 @@ class MockSharedWorkerFactory : public mojom::SharedWorkerFactory {
   struct CreateParams {
     CreateParams();
     ~CreateParams();
-    mojom::SharedWorkerInfoPtr info;
+    blink::mojom::SharedWorkerInfoPtr info;
     bool pause_on_start;
     blink::mojom::WorkerContentSettingsProxyPtr content_settings;
     mojom::SharedWorkerHostPtr host;

content/browser/worker_host/shared_worker_connector_impl.cc

@@ -30,7 +30,7 @@ SharedWorkerConnectorImpl::SharedWorkerConnectorImpl(int process_id,
     : process_id_(process_id), frame_id_(frame_id) {}
 
 void SharedWorkerConnectorImpl::Connect(
-    mojom::SharedWorkerInfoPtr info,
+    blink::mojom::SharedWorkerInfoPtr info,
     blink::mojom::SharedWorkerClientPtr client,
     blink::mojom::SharedWorkerCreationContextType creation_context_type,
     mojo::ScopedMessagePipeHandle message_port,

content/browser/worker_host/shared_worker_connector_impl.h

@@ -24,7 +24,7 @@ class CONTENT_EXPORT SharedWorkerConnectorImpl
 
   // mojom::SharedWorkerConnector methods:
   void Connect(
-      mojom::SharedWorkerInfoPtr info,
+      blink::mojom::SharedWorkerInfoPtr info,
       blink::mojom::SharedWorkerClientPtr client,
       blink::mojom::SharedWorkerCreationContextType creation_context_type,
       mojo::ScopedMessagePipeHandle message_port,

content/browser/worker_host/shared_worker_host.cc

@@ -180,7 +180,7 @@ void SharedWorkerHost::Start(
   }
 #endif  // DCHECK_IS_ON()
 
-  mojom::SharedWorkerInfoPtr info(mojom::SharedWorkerInfo::New(
+  blink::mojom::SharedWorkerInfoPtr info(blink::mojom::SharedWorkerInfo::New(
       instance_->url(), instance_->name(), instance_->content_security_policy(),
       instance_->content_security_policy_type(),
       instance_->creation_address_space()));

content/browser/worker_host/shared_worker_service_impl.cc

@@ -107,7 +107,7 @@ void SharedWorkerServiceImpl::SetWorkerTerminationCallbackForTesting(
 void SharedWorkerServiceImpl::ConnectToWorker(
     int process_id,
     int frame_id,
-    mojom::SharedWorkerInfoPtr info,
+    blink::mojom::SharedWorkerInfoPtr info,
     blink::mojom::SharedWorkerClientPtr client,
     blink::mojom::SharedWorkerCreationContextType creation_context_type,
     const blink::MessagePortChannel& message_port,

content/browser/worker_host/shared_worker_service_impl.h

@@ -58,7 +58,7 @@ class CONTENT_EXPORT SharedWorkerServiceImpl : public SharedWorkerService {
   void ConnectToWorker(
       int process_id,
       int frame_id,
-      mojom::SharedWorkerInfoPtr info,
+      blink::mojom::SharedWorkerInfoPtr info,
       blink::mojom::SharedWorkerClientPtr client,
       blink::mojom::SharedWorkerCreationContextType creation_context_type,
       const blink::MessagePortChannel& port,

content/browser/worker_host/shared_worker_service_impl_unittest.cc

@@ -107,7 +107,7 @@ void ConnectToSharedWorker(mojom::SharedWorkerConnectorPtr connector,
                            const std::string& name,
                            MockSharedWorkerClient* client,
                            MessagePortChannel* local_port) {
-  mojom::SharedWorkerInfoPtr info(mojom::SharedWorkerInfo::New(
+  blink::mojom::SharedWorkerInfoPtr info(blink::mojom::SharedWorkerInfo::New(
       url, name, std::string(),
       blink::mojom::ContentSecurityPolicyType::kReport,
       blink::mojom::IPAddressSpace::kPublic));

content/common/BUILD.gn

@@ -516,7 +516,6 @@ mojom("mojo_bindings") {
     "shared_worker/shared_worker_connector.mojom",
     "shared_worker/shared_worker_factory.mojom",
     "shared_worker/shared_worker_host.mojom",
-    "shared_worker/shared_worker_info.mojom",
     "url_loader_factory_bundle.mojom",
     "widget.mojom",
   ]

content/common/shared_worker/shared_worker_connector.mojom

@@ -4,10 +4,10 @@
 
 module content.mojom;
 
-import "content/common/shared_worker/shared_worker_info.mojom";
 import "third_party/blink/public/mojom/blob/blob_url_store.mojom";
 import "third_party/blink/public/mojom/worker/shared_worker_client.mojom";
 import "third_party/blink/public/mojom/worker/shared_worker_creation_context_type.mojom";
+import "third_party/blink/public/mojom/worker/shared_worker_info.mojom";
 
 // This interface is exposed to enable a client to create and connect to a
 // shared worker.
@@ -18,7 +18,7 @@ interface SharedWorkerConnector {
   // URL. The token will then be used to look up the blob associated with the
   // blob URL. Without this by the time the worker code starts fetching
   // the URL the blob URL might no longer be valid.
-  Connect(SharedWorkerInfo info,
+  Connect(blink.mojom.SharedWorkerInfo info,
           blink.mojom.SharedWorkerClient client,
           blink.mojom.SharedWorkerCreationContextType creation_context_type,
           handle<message_pipe> message_port,

content/common/shared_worker/shared_worker_factory.mojom

@@ -7,7 +7,6 @@ module content.mojom;
 import "content/common/service_worker/service_worker_provider.mojom";
 import "content/common/shared_worker/shared_worker.mojom";
 import "content/common/shared_worker/shared_worker_host.mojom";
-import "content/common/shared_worker/shared_worker_info.mojom";
 import "content/common/url_loader_factory_bundle.mojom";
 import "content/public/common/renderer_preference_watcher.mojom";
 import "content/public/common/renderer_preferences.mojom";
@@ -15,6 +14,7 @@ import "mojo/public/mojom/base/unguessable_token.mojom";
 import "services/network/public/mojom/url_loader_factory.mojom";
 import "services/service_manager/public/mojom/interface_provider.mojom";
 import "third_party/blink/public/mojom/service_worker/controller_service_worker.mojom";
+import "third_party/blink/public/mojom/worker/shared_worker_info.mojom";
 import "third_party/blink/public/mojom/worker/worker_main_script_load_params.mojom";
 import "third_party/blink/public/web/worker_content_settings_proxy.mojom";
 
@@ -32,7 +32,7 @@ interface SharedWorkerFactory {
   // TODO(sammc): Change shared workers to obtain |content_settings| via
   // |interface_provider| instead of receiving plumbing it here.
   CreateSharedWorker(
-      SharedWorkerInfo info,
+      blink.mojom.SharedWorkerInfo info,
       bool pause_on_start,
       mojo_base.mojom.UnguessableToken devtools_worker_token,
       RendererPreferences renderer_preferences,

content/renderer/shared_worker/embedded_shared_worker_stub.cc

@@ -207,7 +207,7 @@ class WebServiceWorkerNetworkProviderForSharedWorker
 }  // namespace
 
 EmbeddedSharedWorkerStub::EmbeddedSharedWorkerStub(
-    mojom::SharedWorkerInfoPtr info,
+    blink::mojom::SharedWorkerInfoPtr info,
     bool pause_on_start,
     const base::UnguessableToken& devtools_worker_token,
     const RendererPreferences& renderer_preferences,

content/renderer/shared_worker/embedded_shared_worker_stub.h

@@ -13,13 +13,13 @@
 #include "content/common/service_worker/service_worker_provider.mojom.h"
 #include "content/common/shared_worker/shared_worker.mojom.h"
 #include "content/common/shared_worker/shared_worker_host.mojom.h"
-#include "content/common/shared_worker/shared_worker_info.mojom.h"
 #include "content/public/common/renderer_preference_watcher.mojom.h"
 #include "content/public/common/renderer_preferences.h"
 #include "ipc/ipc_listener.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "services/service_manager/public/mojom/interface_provider.mojom.h"
+#include "third_party/blink/public/mojom/worker/shared_worker_info.mojom.h"
 #include "third_party/blink/public/mojom/worker/worker_main_script_load_params.mojom.h"
 #include "third_party/blink/public/platform/web_content_security_policy.h"
 #include "third_party/blink/public/platform/web_content_settings_client.h"
@@ -59,7 +59,7 @@ class EmbeddedSharedWorkerStub : public blink::WebSharedWorkerClient,
                                  public mojom::SharedWorker {
  public:
   EmbeddedSharedWorkerStub(
-      mojom::SharedWorkerInfoPtr info,
+      blink::mojom::SharedWorkerInfoPtr info,
       bool pause_on_start,
       const base::UnguessableToken& devtools_worker_token,
       const RendererPreferences& renderer_preferences,

content/renderer/shared_worker/shared_worker_factory_impl.cc

@@ -21,7 +21,7 @@ void SharedWorkerFactoryImpl::Create(
 SharedWorkerFactoryImpl::SharedWorkerFactoryImpl() {}
 
 void SharedWorkerFactoryImpl::CreateSharedWorker(
-    mojom::SharedWorkerInfoPtr info,
+    blink::mojom::SharedWorkerInfoPtr info,
     bool pause_on_start,
     const base::UnguessableToken& devtools_worker_token,
     const RendererPreferences& renderer_preferences,

content/renderer/shared_worker/shared_worker_factory_impl.h

@@ -22,7 +22,7 @@ class SharedWorkerFactoryImpl : public mojom::SharedWorkerFactory {
 
   // mojom::SharedWorkerFactory methods:
   void CreateSharedWorker(
-      mojom::SharedWorkerInfoPtr info,
+      blink::mojom::SharedWorkerInfoPtr info,
       bool pause_on_start,
       const base::UnguessableToken& devtools_worker_token,
       const RendererPreferences& renderer_preferences,

content/renderer/shared_worker/shared_worker_repository.cc

@@ -32,7 +32,7 @@ void SharedWorkerRepository::Connect(
   if (!connector_)
     interface_provider_->GetInterface(mojo::MakeRequest(&connector_));
 
-  mojom::SharedWorkerInfoPtr info(mojom::SharedWorkerInfo::New(
+  blink::mojom::SharedWorkerInfoPtr info(blink::mojom::SharedWorkerInfo::New(
       url, name.Utf8(), content_security_policy.Utf8(),
       content_security_policy_type, creation_address_space));
 

third_party/blink/public/mojom/BUILD.gn

@@ -72,6 +72,7 @@ mojom("mojom_platform") {
     "worker/dedicated_worker_factory.mojom",
     "worker/shared_worker_client.mojom",
     "worker/shared_worker_creation_context_type.mojom",
+    "worker/shared_worker_info.mojom",
     "worker/worker_main_script_load_params.mojom",
   ]
 

content/common/shared_worker/shared_worker_info.mojom → third_party/blink/public/mojom/worker/shared_worker_info.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 "third_party/blink/public/mojom/net/ip_address_space.mojom";
 import "third_party/blink/public/mojom/csp/content_security_policy.mojom";