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

content/child/service_worker/service_worker_network_provider.cc

 // Copyright 2014 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/service_worker_network_provider.h"
 
 #include "base/atomic_sequence_num.h"
 #include "content/child/child_thread_impl.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/common/service_worker/service_worker_messages.h"
@@ skipping 20 matching lines @@
 
 ServiceWorkerNetworkProvider* ServiceWorkerNetworkProvider::FromDocumentState(
     base::SupportsUserData* datasource_userdata) {
   return static_cast<ServiceWorkerNetworkProvider*>(
       datasource_userdata->GetUserData(&kUserDataKey));
 }
 
 ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider(
     int route_id,
     ServiceWorkerProviderType provider_type)
-    : provider_id_(GetNextProviderId()),
-      context_(new ServiceWorkerProviderContext(provider_id_)) {
+    : provider_id_(provider_type == SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME
+                       ? kInvalidServiceWorkerProviderId
+                       : GetNextProviderId()) {

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

nit: could this part be factored out as a static function (maybe with a bit of
comment describing why we don't assign a new ID for sandboxed frame) for
readability?

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

Done.

+  if (provider_id_ == kInvalidServiceWorkerProviderId)
+    return;
+  context_ = new ServiceWorkerProviderContext(provider_id_);
   if (!ChildThreadImpl::current())
     return;  // May be null in some tests.
   ChildThreadImpl::current()->Send(new ServiceWorkerHostMsg_ProviderCreated(
       provider_id_, route_id, provider_type));
 }
 
 ServiceWorkerNetworkProvider::~ServiceWorkerNetworkProvider() {
+  if (provider_id_ == kInvalidServiceWorkerProviderId)
+    return;
   if (!ChildThreadImpl::current())
     return;  // May be null in some tests.
   ChildThreadImpl::current()->Send(
       new ServiceWorkerHostMsg_ProviderDestroyed(provider_id_));
 }
 
 void ServiceWorkerNetworkProvider::SetServiceWorkerVersionId(
     int64 version_id) {
+  DCHECK(provider_id_ != kInvalidServiceWorkerProviderId);

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

nit: DCHECK_NE

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

Done.

   if (!ChildThreadImpl::current())
     return;  // May be null in some tests.
   ChildThreadImpl::current()->Send(
       new ServiceWorkerHostMsg_SetVersionId(provider_id_, version_id));
 }
 
 }  // namespace content