service worker: Don't control a subframe of an insecure context

content/browser/service_worker/service_worker_request_handler.cc

Index: content/browser/service_worker/service_worker_request_handler.cc
diff --git a/content/browser/service_worker/service_worker_request_handler.cc b/content/browser/service_worker/service_worker_request_handler.cc
index 0195e32ddbd357d7cfb90cebda1a51666b373fc3..de41b7de5ac8b22d80b5ed34619b3ab2724dcf40 100644
--- a/content/browser/service_worker/service_worker_request_handler.cc
+++ b/content/browser/service_worker/service_worker_request_handler.cc
@@ -216,10 +216,14 @@ void ServiceWorkerRequestHandler::CompleteCrossSiteTransfer(
   CHECK(!IsBrowserSideNavigationEnabled());
   if (!host_for_cross_site_transfer_.get() || !context_)
     return;
+  if (new_provider_id == kInvalidServiceWorkerVersionId)

[Marijn Kruisselbrink, 2016/05/26 20:37:11]

Shouldn't this be kInvalidServiceWorkerProviderId rather than VersionId? I know
they're all -1, but the types are different.

[falken, 2016/05/27 05:47:04]

Done. Bad autocomplete choice.

+    return;
   DCHECK_EQ(provider_host_.get(), host_for_cross_site_transfer_.get());
-  context_->TransferProviderHostIn(new_process_id, new_provider_id,
-                                   std::move(host_for_cross_site_transfer_));
-  DCHECK_EQ(provider_host_->provider_id(), new_provider_id);
+  if (context_->TransferProviderHostIn(
+          new_process_id, new_provider_id,
+          std::move(host_for_cross_site_transfer_))) {
+    DCHECK_EQ(provider_host_->provider_id(), new_provider_id);
+  }
 }
 
 void ServiceWorkerRequestHandler::MaybeCompleteCrossSiteTransferInOldProcess(