M52: Merge "Reland: service worker: Don't control a subframe of an insecure context"

content/browser/service_worker/service_worker_registration.cc

Index: content/browser/service_worker/service_worker_registration.cc
diff --git a/content/browser/service_worker/service_worker_registration.cc b/content/browser/service_worker/service_worker_registration.cc
index b803edf1865954db918665b644c0d8f173607f8d..047e20f82f5ec80c82b79b413206383229571868 100644
--- a/content/browser/service_worker/service_worker_registration.cc
+++ b/content/browser/service_worker/service_worker_registration.cc
@@ -192,6 +192,8 @@ void ServiceWorkerRegistration::ClaimClients() {
       continue;
     if (host->controlling_version() == active_version())
       continue;
+    if (!host->IsContextSecureForServiceWorker())
+      continue;
     if (host->MatchRegistration() == this)
       host->ClaimedByRegistration(this);
   }