Manage ServiceWorkerDispatcherHost in ServiceWorkerContextCore

content/child/service_worker/service_worker_network_provider.cc

Index: content/child/service_worker/service_worker_network_provider.cc
diff --git a/content/child/service_worker/service_worker_network_provider.cc b/content/child/service_worker/service_worker_network_provider.cc
index 9e36b7d41cdabc50f686860e94e39510a721abf3..97f88a799a2b068aef2e1c2e1e8924092f401634 100644
--- a/content/child/service_worker/service_worker_network_provider.cc
+++ b/content/child/service_worker/service_worker_network_provider.cc
@@ -9,6 +9,7 @@
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/common/navigation_params.h"
 #include "content/common/service_worker/service_worker_messages.h"
+#include "content/common/service_worker/service_worker_provider_host_info.h"
 #include "content/common/service_worker/service_worker_utils.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "ipc/ipc_sync_channel.h"
@@ -126,18 +127,14 @@ ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider(
     return;
   if (!ChildThreadImpl::current())
     return;  // May be null in some tests.
+  ServiceWorkerProviderHostInfo host_info(provider_id_, route_id, provider_type,

[kinuko, 2017/02/14 02:25:38]

nit: I feel it might look slightly more consistent to call it 'provider_info' or
rename the mojo call to CreateProviderHost (so it becomes clearer 'we created
provider and send its info' or 'we want to create a provider host and send its
ctor info'), but up to you

[shimazu, 2017/02/14 07:58:14]

Sounds good. I've done the former, thanks!

+                                          is_parent_frame_secure);
   context_ = new ServiceWorkerProviderContext(
       provider_id_, provider_type,
       ChildThreadImpl::current()->thread_safe_sender());
-  if (ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) {
-    ChildThreadImpl::current()->channel()->GetRemoteAssociatedInterface(
-        &dispatcher_host_);
-    dispatcher_host_->OnProviderCreated(provider_id_, route_id, provider_type,
-                                        is_parent_frame_secure);
-  } else {
-    ChildThreadImpl::current()->Send(new ServiceWorkerHostMsg_ProviderCreated(
-        provider_id_, route_id, provider_type, is_parent_frame_secure));
-  }
+  ChildThreadImpl::current()->channel()->GetRemoteAssociatedInterface(
+      &dispatcher_host_);
+  dispatcher_host_->OnProviderCreated(std::move(host_info));
 }
 
 ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider(
@@ -157,12 +154,7 @@ ServiceWorkerNetworkProvider::~ServiceWorkerNetworkProvider() {
     return;
   if (!ChildThreadImpl::current())
     return;  // May be null in some tests.
-  if (ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) {
-    dispatcher_host_->OnProviderDestroyed(provider_id());
-  } else {
-    ChildThreadImpl::current()->Send(
-        new ServiceWorkerHostMsg_ProviderDestroyed(provider_id_));
-  }
+  dispatcher_host_->OnProviderDestroyed(provider_id());
 }
 
 void ServiceWorkerNetworkProvider::SetServiceWorkerVersionId(
@@ -171,13 +163,8 @@ void ServiceWorkerNetworkProvider::SetServiceWorkerVersionId(
   DCHECK_NE(kInvalidServiceWorkerProviderId, provider_id_);
   if (!ChildThreadImpl::current())
     return;  // May be null in some tests.
-  if (ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) {
-    dispatcher_host_->OnSetHostedVersionId(provider_id(), version_id,
-                                           embedded_worker_id);
-  } else {
-    ChildThreadImpl::current()->Send(new ServiceWorkerHostMsg_SetVersionId(
-        provider_id_, version_id, embedded_worker_id));
-  }
+  dispatcher_host_->OnSetHostedVersionId(provider_id(), version_id,
+                                         embedded_worker_id);
 }
 
 bool ServiceWorkerNetworkProvider::IsControlledByServiceWorker() const {