Manage ServiceWorkerDispatcherHost in ServiceWorkerContextCore

content/browser/service_worker/link_header_support_unittest.cc

 // Copyright 2016 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/link_header_support.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "content/browser/loader/resource_request_info_impl.h"
@@ skipping 47 matching lines @@
   LinkHeaderServiceWorkerTest()
       : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP),
         resource_context_(&request_context_) {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExperimentalWebPlatformFeatures);
   }
   ~LinkHeaderServiceWorkerTest() override {}
 
   void SetUp() override {
     helper_.reset(new EmbeddedWorkerTestHelper(base::FilePath()));
-
-    // An empty host.
-    std::unique_ptr<ServiceWorkerProviderHost> host(
-        new ServiceWorkerProviderHost(
-            render_process_id(), MSG_ROUTING_NONE, kMockProviderId,
-            SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-            ServiceWorkerProviderHost::FrameSecurityLevel::UNINITIALIZED,
-            context()->AsWeakPtr(), nullptr));
-    provider_host_ = host->AsWeakPtr();
-    context()->AddProviderHost(std::move(host));
   }
 
   void TearDown() override { helper_.reset(); }
 
   ServiceWorkerContextCore* context() { return helper_->context(); }
   ServiceWorkerContextWrapper* context_wrapper() {
     return helper_->context_wrapper();
   }
   ServiceWorkerProviderHost* provider_host() { return provider_host_.get(); }
   int render_process_id() const { return helper_->mock_render_process_id(); }
 
+  void CreateDocumentProviderHost(bool is_parent_frame_secure = true) {
+    // An empty host.
+    std::unique_ptr<ServiceWorkerProviderHost> host =
+        CreateProviderHostForWindow(render_process_id(), kMockProviderId,
+                                    is_parent_frame_secure,
+                                    context()->AsWeakPtr());
+    provider_host_ = host->AsWeakPtr();
+    EXPECT_FALSE(
+        context()->GetProviderHost(host->process_id(), host->provider_id()));
+    context()->AddProviderHost(std::move(host));
+  }
+
   void CreateServiceWorkerProviderHost() {
-    std::unique_ptr<ServiceWorkerProviderHost> host(
-        new ServiceWorkerProviderHost(
-            render_process_id(), MSG_ROUTING_NONE, kMockProviderId,
-            SERVICE_WORKER_PROVIDER_FOR_CONTROLLER,
-            ServiceWorkerProviderHost::FrameSecurityLevel::UNINITIALIZED,
-            context()->AsWeakPtr(), nullptr));
+    std::unique_ptr<ServiceWorkerProviderHost> host =
+        CreateProviderHostForServiceWorkerContext(
+            render_process_id(), kMockProviderId,
+            true /* is_parent_frame_secure */, context()->AsWeakPtr());
     provider_host_ = host->AsWeakPtr();
-    context()->RemoveProviderHost(host->process_id(), host->provider_id());
+    EXPECT_FALSE(
+        context()->GetProviderHost(host->process_id(), host->provider_id()));
     context()->AddProviderHost(std::move(host));
 
     scoped_refptr<ServiceWorkerRegistration> registration =
         new ServiceWorkerRegistration(GURL("https://host/scope"), 1L,
                                       context()->AsWeakPtr());
     scoped_refptr<ServiceWorkerVersion> version = new ServiceWorkerVersion(
         registration.get(), GURL("https://host/script.js"), 1L,
         context()->AsWeakPtr());
 
     provider_host_->running_hosted_version_ = version;
@@ skipping 42 matching lines @@
   TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<EmbeddedWorkerTestHelper> helper_;
   net::TestURLRequestContext request_context_;
   net::TestDelegate request_delegate_;
   MockResourceContext resource_context_;
   base::WeakPtr<ServiceWorkerProviderHost> provider_host_;
   storage::BlobStorageContext blob_storage_context_;
 };
 
 TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_Basic) {
+  CreateDocumentProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foo/bar/")).get(),
       "<../foo.js>; rel=serviceworker", context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(1u, registrations.size());
   EXPECT_EQ(GURL("https://example.com/foo/"), registrations[0].pattern);
   EXPECT_EQ(GURL("https://example.com/foo/foo.js"),
             registrations[0].active_version.script_url);
 }
 
 TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_ScopeWithFragment) {
+  CreateDocumentProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foo/bar/")).get(),
       "<../bar.js>; rel=serviceworker; scope=\"scope#ref\"", context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(1u, registrations.size());
   EXPECT_EQ(GURL("https://example.com/foo/bar/scope"),
             registrations[0].pattern);
   EXPECT_EQ(GURL("https://example.com/foo/bar.js"),
             registrations[0].active_version.script_url);
 }
 
 TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_ScopeAbsoluteUrl) {
+  CreateDocumentProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foo/bar/")).get(),
       "<bar.js>; rel=serviceworker; "
       "scope=\"https://example.com:443/foo/bar/scope\"",
       context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(1u, registrations.size());
   EXPECT_EQ(GURL("https://example.com/foo/bar/scope"),
             registrations[0].pattern);
   EXPECT_EQ(GURL("https://example.com/foo/bar/bar.js"),
             registrations[0].active_version.script_url);
 }
 
 TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_ScopeDifferentOrigin) {
+  CreateDocumentProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
       "<bar.js>; rel=serviceworker; scope=\"https://google.com/scope\"",
       context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(0u, registrations.size());
 }
 
 TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_ScopeUrlEncodedSlash) {
+  CreateDocumentProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
       "<bar.js>; rel=serviceworker; scope=\"./foo%2Fbar\"", context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(0u, registrations.size());
 }
 
 TEST_F(LinkHeaderServiceWorkerTest,
        InstallServiceWorker_ScriptUrlEncodedSlash) {
+  CreateDocumentProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
       "<foo%2Fbar.js>; rel=serviceworker", context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(0u, registrations.size());
 }
 
 TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_ScriptAbsoluteUrl) {
+  CreateDocumentProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
       "<https://example.com/bar.js>; rel=serviceworker; scope=foo",
       context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(1u, registrations.size());
   EXPECT_EQ(GURL("https://example.com/foobar/foo"), registrations[0].pattern);
   EXPECT_EQ(GURL("https://example.com/bar.js"),
             registrations[0].active_version.script_url);
 }
 
 TEST_F(LinkHeaderServiceWorkerTest,
        InstallServiceWorker_ScriptDifferentOrigin) {
+  CreateDocumentProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
       "<https://google.com/bar.js>; rel=serviceworker; scope=foo",
       context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(0u, registrations.size());
 }
 
 TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_MultipleWorkers) {
+  CreateDocumentProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
       "<bar.js>; rel=serviceworker; scope=foo, <baz.js>; "
       "rel=serviceworker; scope=scope",
       context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(2u, registrations.size());
   EXPECT_EQ(GURL("https://example.com/foobar/foo"), registrations[0].pattern);
   EXPECT_EQ(GURL("https://example.com/foobar/bar.js"),
             registrations[0].active_version.script_url);
   EXPECT_EQ(GURL("https://example.com/foobar/scope"), registrations[1].pattern);
   EXPECT_EQ(GURL("https://example.com/foobar/baz.js"),
             registrations[1].active_version.script_url);
 }
 
 TEST_F(LinkHeaderServiceWorkerTest,
        InstallServiceWorker_ValidAndInvalidValues) {
+  CreateDocumentProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
       "<https://google.com/bar.js>; rel=serviceworker; scope=foo, <baz.js>; "
       "rel=serviceworker; scope=scope",
       context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(1u, registrations.size());
   EXPECT_EQ(GURL("https://example.com/foobar/scope"), registrations[0].pattern);
   EXPECT_EQ(GURL("https://example.com/foobar/baz.js"),
             registrations[0].active_version.script_url);
 }
 
 TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_InsecureContext) {
+  CreateDocumentProviderHost();
   std::unique_ptr<net::URLRequest> request =
       CreateSubresourceRequest(GURL("https://example.com/foo/bar/"));
   ResourceRequestInfoImpl::ForRequest(request.get())
       ->set_initiated_in_secure_context_for_testing(false);
   ProcessLinkHeaderForRequest(request.get(), "<../foo.js>; rel=serviceworker",
                               context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(0u, registrations.size());
 }
 
 TEST_F(LinkHeaderServiceWorkerTest,
        InstallServiceWorker_NavigationFromInsecureContextToSecureContext) {
+  CreateDocumentProviderHost();
   std::unique_ptr<net::URLRequest> request = CreateRequest(
       GURL("https://example.com/foo/bar/"), RESOURCE_TYPE_MAIN_FRAME);
   ResourceRequestInfoImpl::ForRequest(request.get())
       ->set_initiated_in_secure_context_for_testing(false);
 
   provider_host()->SetDocumentUrl(GURL("https://example.com/foo/bar/"));
-  provider_host()->set_parent_frame_secure(true);
 
   ProcessLinkHeaderForRequest(request.get(), "<../foo.js>; rel=serviceworker",
                               context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(1u, registrations.size());
   EXPECT_EQ(GURL("https://example.com/foo/"), registrations[0].pattern);
   EXPECT_EQ(GURL("https://example.com/foo/foo.js"),
             registrations[0].active_version.script_url);
 }
 
 TEST_F(LinkHeaderServiceWorkerTest,
        InstallServiceWorker_NavigationToInsecureContext) {
+  CreateDocumentProviderHost();
   provider_host()->SetDocumentUrl(GURL("http://example.com/foo/bar/"));
-  provider_host()->set_parent_frame_secure(true);
   ProcessLinkHeaderForRequest(CreateRequest(GURL("http://example.com/foo/bar/"),
                                             RESOURCE_TYPE_MAIN_FRAME)
                                   .get(),
                               "<../foo.js>; rel=serviceworker",
                               context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(0u, registrations.size());
 }
 
 TEST_F(LinkHeaderServiceWorkerTest,
        InstallServiceWorker_NavigationToInsecureHttpsContext) {
+  CreateDocumentProviderHost(false);

[falken, 2017/02/13 05:59:24]

nit: slightly prefer making a CreateInsecureDocumentProviderHost function
instead of using the default parameter. Otherwise, add /* is_parent_frame_secure
*/ comment.

[shimazu, 2017/02/13 08:20:19]

Thanks, I've added CreateInsecureDocumentProviderHost instead of the default
parameter.

   provider_host()->SetDocumentUrl(GURL("https://example.com/foo/bar/"));
-  provider_host()->set_parent_frame_secure(false);
   ProcessLinkHeaderForRequest(
       CreateRequest(GURL("https://example.com/foo/bar/"),
                     RESOURCE_TYPE_MAIN_FRAME)
           .get(),
       "<../foo.js>; rel=serviceworker", context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(0u, registrations.size());
 }
 
 TEST_F(LinkHeaderServiceWorkerTest,
        InstallServiceWorker_FromWorkerWithoutControllees) {
   CreateServiceWorkerProviderHost();
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foo/bar/")).get(),
       "<../foo.js>; rel=serviceworker", context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(0u, registrations.size());
 }
 
 TEST_F(LinkHeaderServiceWorkerTest,
        InstallServiceWorker_FromWorkerWithControllees) {
   CreateServiceWorkerProviderHost();
 
-  std::unique_ptr<ServiceWorkerProviderHost> controllee(
-      new ServiceWorkerProviderHost(
-          render_process_id(), MSG_ROUTING_NONE, kMockProviderId,
-          SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-          ServiceWorkerProviderHost::FrameSecurityLevel::UNINITIALIZED,
-          context()->AsWeakPtr(), nullptr));
+  std::unique_ptr<ServiceWorkerProviderHost> controllee =
+      CreateProviderHostForWindow(render_process_id(), kMockProviderId,
+                                  true /* is_parent_frame_secure */,
+                                  context()->AsWeakPtr());
   provider_host()->running_hosted_version()->AddControllee(controllee.get());
 
   ProcessLinkHeaderForRequest(
       CreateSubresourceRequest(GURL("https://example.com/foo/bar/")).get(),
       "<../foo.js>; rel=serviceworker", context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(1u, registrations.size());
 }
 
 }  // namespace content