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

content/browser/service_worker/service_worker_request_handler_unittest.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/browser/service_worker/service_worker_request_handler.h"
 
 #include <utility>
 
 #include "base/run_loop.h"
 #include "content/browser/fileapi/mock_url_request_delegate.h"
@@ skipping 24 matching lines @@
 
 class ServiceWorkerRequestHandlerTest : public testing::Test {
  public:
   ServiceWorkerRequestHandlerTest()
       : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {}
 
   void SetUp() override {
     helper_.reset(new EmbeddedWorkerTestHelper(base::FilePath()));
 
     // A new unstored registration/version.
-    registration_ = new ServiceWorkerRegistration(
-        GURL("http://host/scope/"), 1L, context()->AsWeakPtr());
+    registration_ = new ServiceWorkerRegistration(GURL("https://host/scope/"),
+                                                  1L, context()->AsWeakPtr());
     version_ = new ServiceWorkerVersion(registration_.get(),
-                                        GURL("http://host/script.js"),
-                                        1L,
+                                        GURL("https://host/script.js"), 1L,
                                         context()->AsWeakPtr());
 
     // An empty host.
     std::unique_ptr<ServiceWorkerProviderHost> host(
-        new ServiceWorkerProviderHost(helper_->mock_render_process_id(),
-                                      MSG_ROUTING_NONE, kMockProviderId,
-                                      SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-                                      context()->AsWeakPtr(), nullptr));
-    host->SetDocumentUrl(GURL("http://host/scope/"));
+        new ServiceWorkerProviderHost(
+            helper_->mock_render_process_id(), MSG_ROUTING_NONE,
+            kMockProviderId, SERVICE_WORKER_PROVIDER_FOR_WINDOW,
+            ServiceWorkerProviderHost::FrameSecurityLevel::SECURE,
+            context()->AsWeakPtr(), nullptr));
+    host->SetDocumentUrl(GURL("https://host/scope/"));
     provider_host_ = host->AsWeakPtr();
     context()->AddProviderHost(std::move(host));
 
     context()->storage()->LazyInitialize(base::Bind(&EmptyCallback));
     base::RunLoop().RunUntilIdle();
 
     version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
     registration_->SetActiveVersion(version_);
     context()->storage()->StoreRegistration(
         registration_.get(),
@@ skipping 86 matching lines @@
   provider_host_->SetDocumentUrl(GURL(""));
   EXPECT_FALSE(InitializeHandlerCheck(
       "http://host/scope/doc", "GET", true, RESOURCE_TYPE_IMAGE));
   EXPECT_STREQ("", provider_host_->document_url().spec().c_str());
   EXPECT_FALSE(InitializeHandlerCheck(
       "https://host/scope/doc", "GET", true, RESOURCE_TYPE_IMAGE));
   EXPECT_STREQ("", provider_host_->document_url().spec().c_str());
 }
 
 }  // namespace content