Don't create ServiceWorkerProviderHost for sandboxed frames without allow-same-origin flag.

content/child/service_worker/web_service_worker_provider_impl.cc

 // Copyright 2013 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.
 
 #include "content/child/service_worker/web_service_worker_provider_impl.h"
 
 #include "content/child/service_worker/service_worker_dispatcher.h"
 #include "content/child/service_worker/service_worker_handle_reference.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/child/service_worker/web_service_worker_impl.h"
@@ skipping 16 matching lines @@
   // Make sure the provider client is removed.
   RemoveProviderClient();
 }
 
 void WebServiceWorkerProviderImpl::setClient(
     blink::WebServiceWorkerProviderClient* client) {
   if (!client) {
     RemoveProviderClient();
     return;
   }
+  if (!context_)

[kinuko, 2015/06/23 10:55:56]

Can we add a comment about when context_ is null, maybe in the header file?

[horo, 2015/06/23 13:55:13]

After https://codereview.chromium.org/1199183002/, WebServiceWorkerProviderImpl
will not be created for the sandboxed iframe.
So I added DCHECK(context_); in the constructor.

+    return;
 
   // TODO(kinuko): Here we could also register the current thread ID
   // on the provider context so that multiple WebServiceWorkerProviderImpl
   // (e.g. on document and on dedicated workers) can properly share
   // the single provider context across threads. (http://crbug.com/366538
   // for more context)
   GetDispatcher()->AddProviderClient(context_->provider_id(), client);
 
   if (!context_->controller())
     return;
   client->setController(
       GetDispatcher()->GetServiceWorker(context_->controller()->info(), false),
       false /* shouldNotifyControllerChange */);
 }
 
 void WebServiceWorkerProviderImpl::registerServiceWorker(
     const WebURL& pattern,
     const WebURL& script_url,
     WebServiceWorkerRegistrationCallbacks* callbacks) {
+  if (!context_)
+    return;

[kinuko, 2015/06/23 10:55:56]

Hmm, we'll leak callbacks.  Also is it ok not to fire it?

[horo, 2015/06/23 13:55:14]

Same as the former

   GetDispatcher()->RegisterServiceWorker(
       context_->provider_id(), pattern, script_url, callbacks);
 }
 
 void WebServiceWorkerProviderImpl::getRegistration(
     const blink::WebURL& document_url,
     WebServiceWorkerRegistrationCallbacks* callbacks) {
+  if (!context_)
+    return;
   GetDispatcher()->GetRegistration(
       context_->provider_id(), document_url, callbacks);
 }
 
 void WebServiceWorkerProviderImpl::getRegistrations(
     WebServiceWorkerGetRegistrationsCallbacks* callbacks) {
+  if (!context_)
+    return;
   GetDispatcher()->GetRegistrations(
       context_->provider_id(), callbacks);
 }
 
 void WebServiceWorkerProviderImpl::getRegistrationForReady(
     WebServiceWorkerGetRegistrationForReadyCallbacks* callbacks) {
+  if (!context_)
+    return;
   GetDispatcher()->GetRegistrationForReady(context_->provider_id(), callbacks);
 }
 
 int WebServiceWorkerProviderImpl::provider_id() const {
+  if (!context_)
+    return kInvalidServiceWorkerProviderId;
   return context_->provider_id();
 }
 
 void WebServiceWorkerProviderImpl::RemoveProviderClient() {
+  if (!context_)
+    return;
   // Remove the provider client, but only if the dispatcher is still there.
   // (For cleanup path we don't need to bother creating a new dispatcher)
   ServiceWorkerDispatcher* dispatcher =
       ServiceWorkerDispatcher::GetThreadSpecificInstance();
   if (dispatcher)
     dispatcher->RemoveProviderClient(context_->provider_id());
 }
 
 ServiceWorkerDispatcher* WebServiceWorkerProviderImpl::GetDispatcher() {
   return ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(
       thread_safe_sender_.get());
 }
 
 }  // namespace content