Implement updateViaCache flag and no-cache by default for main service worker scripts

content/browser/service_worker/service_worker_context_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_context_request_handler.h"
 
 #include <utility>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
 class ServiceWorkerContextRequestHandlerTest : public testing::Test {
  public:
   ServiceWorkerContextRequestHandlerTest()
       : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {}
 
   void SetUp() override {
     helper_.reset(new EmbeddedWorkerTestHelper(base::FilePath()));
     context()->storage()->LazyInitialize(base::Bind(&base::DoNothing));
     base::RunLoop().RunUntilIdle();
 
-    // A new unstored registration/version.
     scope_ = GURL("https://host/scope/");
     script_url_ = GURL("https://host/script.js");
     import_script_url_ = GURL("https://host/import.js");
-    registration_ = new ServiceWorkerRegistration(
-        ServiceWorkerRegistrationOptions(scope_), 1L, context()->AsWeakPtr());
-    version_ = new ServiceWorkerVersion(registration_.get(), script_url_,
-                                        context()->storage()->NewVersionId(),
-                                        context()->AsWeakPtr());
+    provider_host_ = nullptr;
+
+    SetUpServiceWorker();

[nhiroki, 2017/07/21 04:39:46]

All tests seem to explicitly call SetUpServiceWorker() or
SetUpServiceWorkerWithOptions(). How about stopping calling SetUpServiceWorker()
in SetUp()?

[yuryu, 2017/08/03 04:20:05]

Actually these SetUpServiceWorker calls were not necessary so removing them
instead.

     SetUpProvider();
 
     std::unique_ptr<MockHttpProtocolHandler> handler(
         new MockHttpProtocolHandler(
             helper_->browser_context()->GetResourceContext()));
     url_request_job_factory_.SetProtocolHandler("https", std::move(handler));
     url_request_context_.set_job_factory(&url_request_job_factory_);
   }
 
   void TearDown() override {
     version_ = nullptr;
     registration_ = nullptr;
     helper_.reset();
   }
 
   ServiceWorkerContextCore* context() const { return helper_->context(); }
 
+  void SetUpServiceWorker() {
+    SetUpServiceWorkerWithOptions(
+        blink::WebServiceWorkerUpdateViaCache::kImports);

[nhiroki, 2017/07/21 04:39:46]

How about using default value? Default value in production code is basically
discouraged, but it's not in test code :)

[yuryu, 2017/08/03 04:20:05]

Merged SetUpServiceWorker and SetUpServiceWorkerWithOptions and make the
argument mandatory as the only call with the kImports value is in SetUp().

+  }
+
+  void SetUpServiceWorkerWithOptions(
+      blink::WebServiceWorkerUpdateViaCache update_via_cache) {
+    // A new unstored registration/version.

[nhiroki, 2017/07/21 04:39:46]

I feel this comment is not so useful for reading code.

[yuryu, 2017/08/03 04:20:05]

Removed.

+
+    registration_ = new ServiceWorkerRegistration(
+        ServiceWorkerRegistrationOptions(scope_, update_via_cache),
+        context()->storage()->NewRegistrationId(), context()->AsWeakPtr());
+    version_ = new ServiceWorkerVersion(registration_.get(), script_url_,
+                                        context()->storage()->NewVersionId(),
+                                        context()->AsWeakPtr());
+
+    if (provider_host_)
+      provider_host_->running_hosted_version_ = version_;
+  }
+
   void SetUpProvider() {
     std::unique_ptr<ServiceWorkerProviderHost> host =
         CreateProviderHostForServiceWorkerContext(
             helper_->mock_render_process_id(), 1 /* provider_id */,
             true /* is_parent_frame_secure */, context()->AsWeakPtr(),
             &remote_endpoint_);
     provider_host_ = host->AsWeakPtr();
     context()->AddProviderHost(std::move(host));
     provider_host_->running_hosted_version_ = version_;
   }
@@ skipping 35 matching lines @@
   net::TestDelegate url_request_delegate_;
   net::URLRequestJobFactoryImpl url_request_job_factory_;
   GURL scope_;
   GURL script_url_;
   GURL import_script_url_;
   ServiceWorkerRemoteProviderEndpoint remote_endpoint_;
   storage::BlobStorageContext blob_storage_context_;
 };
 
 TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateBefore24Hours) {
+  SetUpServiceWorker();
   // Give the registration a very recent last update time and pretend
   // we're installing a new version.
   registration_->set_last_update_check(base::Time::Now());
+  version_->SetStatus(ServiceWorkerVersion::NEW);
+
+  // Conduct a resource fetch for the main script.
+  base::HistogramTester histograms;
+  std::unique_ptr<net::URLRequest> request(CreateRequest(script_url_));
+  std::unique_ptr<ServiceWorkerContextRequestHandler> handler(
+      CreateHandler(RESOURCE_TYPE_SERVICE_WORKER));
+  std::unique_ptr<net::URLRequestJob> job(
+      handler->MaybeCreateJob(request.get(), nullptr, nullptr));
+  ASSERT_TRUE(job.get());
+  ServiceWorkerWriteToCacheJob* sw_job =
+      static_cast<ServiceWorkerWriteToCacheJob*>(job.get());
+  histograms.ExpectUniqueSample(
+      "ServiceWorker.ContextRequestHandlerStatus.NewWorker.MainScript",
+      static_cast<int>(
+          ServiceWorkerContextRequestHandler::CreateJobStatus::WRITE_JOB),
+      1);
+
+  // Verify the net request is initialized to bypass the browser cache.
+  EXPECT_TRUE(sw_job->net_request_->load_flags() & net::LOAD_BYPASS_CACHE);
+}
+
+TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateBefore24HoursUsingCache) {
+  SetUpServiceWorkerWithOptions(blink::WebServiceWorkerUpdateViaCache::kNone);
+  // Give the registration a very recent last update time and pretend
+  // we're installing a new version.
+  registration_->set_last_update_check(base::Time::Now());
   version_->SetStatus(ServiceWorkerVersion::NEW);
 
   // Conduct a resource fetch for the main script.
   base::HistogramTester histograms;
   std::unique_ptr<net::URLRequest> request(CreateRequest(script_url_));
   std::unique_ptr<ServiceWorkerContextRequestHandler> handler(
       CreateHandler(RESOURCE_TYPE_SERVICE_WORKER));
   std::unique_ptr<net::URLRequestJob> job(
       handler->MaybeCreateJob(request.get(), nullptr, nullptr));
   ASSERT_TRUE(job.get());
   ServiceWorkerWriteToCacheJob* sw_job =
       static_cast<ServiceWorkerWriteToCacheJob*>(job.get());
   histograms.ExpectUniqueSample(
       "ServiceWorker.ContextRequestHandlerStatus.NewWorker.MainScript",
       static_cast<int>(
           ServiceWorkerContextRequestHandler::CreateJobStatus::WRITE_JOB),
       1);
 
   // Verify the net request is not initialized to bypass the browser cache.
   EXPECT_FALSE(sw_job->net_request_->load_flags() & net::LOAD_BYPASS_CACHE);
 }
 
-TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateAfter24Hours) {
+TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateAfter24HoursUsingCache) {
+  SetUpServiceWorkerWithOptions(blink::WebServiceWorkerUpdateViaCache::kNone);
   // Give the registration a old update time and pretend
   // we're installing a new version.
   registration_->set_last_update_check(
       base::Time::Now() - base::TimeDelta::FromDays(7));
   version_->SetStatus(ServiceWorkerVersion::NEW);
 
   // Conduct a resource fetch for the main script.
   base::HistogramTester histograms;
   std::unique_ptr<net::URLRequest> request(CreateRequest(script_url_));
   std::unique_ptr<ServiceWorkerContextRequestHandler> handler(
       CreateHandler(RESOURCE_TYPE_SERVICE_WORKER));
   std::unique_ptr<net::URLRequestJob> job(
       handler->MaybeCreateJob(request.get(), nullptr, nullptr));
   ASSERT_TRUE(job.get());
   ServiceWorkerWriteToCacheJob* sw_job =
       static_cast<ServiceWorkerWriteToCacheJob*>(job.get());
   histograms.ExpectUniqueSample(
       "ServiceWorker.ContextRequestHandlerStatus.NewWorker.MainScript",
       static_cast<int>(
           ServiceWorkerContextRequestHandler::CreateJobStatus::WRITE_JOB),
       1);
 
   // Verify the net request is initialized to bypass the browser cache.
   EXPECT_TRUE(sw_job->net_request_->load_flags() & net::LOAD_BYPASS_CACHE);
 }
 
 TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateForceBypassCache) {
+  SetUpServiceWorkerWithOptions(blink::WebServiceWorkerUpdateViaCache::kNone);
   // Give the registration a very recent last update time and pretend
   // we're installing a new version.
   registration_->set_last_update_check(base::Time::Now());
   version_->SetStatus(ServiceWorkerVersion::NEW);
   version_->set_force_bypass_cache_for_scripts(true);
 
   // Conduct a resource fetch for the main script.
   std::unique_ptr<net::URLRequest> request(CreateRequest(script_url_));
   std::unique_ptr<ServiceWorkerContextRequestHandler> handler(
       CreateHandler(RESOURCE_TYPE_SERVICE_WORKER));
   std::unique_ptr<net::URLRequestJob> job(
       handler->MaybeCreateJob(request.get(), nullptr, nullptr));
   ASSERT_TRUE(job.get());
   ServiceWorkerWriteToCacheJob* sw_job =
       static_cast<ServiceWorkerWriteToCacheJob*>(job.get());
 
   // Verify the net request is initialized to bypass the browser cache.
   EXPECT_TRUE(sw_job->net_request_->load_flags() & net::LOAD_BYPASS_CACHE);
 }
 
 TEST_F(ServiceWorkerContextRequestHandlerTest,
        ServiceWorkerDataRequestAnnotation) {
+  SetUpServiceWorker();
   version_->SetStatus(ServiceWorkerVersion::NEW);
 
   // Conduct a resource fetch for the main script.
   base::HistogramTester histograms;
   std::unique_ptr<net::URLRequest> request(CreateRequest(script_url_));
   std::unique_ptr<ServiceWorkerContextRequestHandler> handler(
       CreateHandler(RESOURCE_TYPE_SERVICE_WORKER));
   std::unique_ptr<net::URLRequestJob> job(
       handler->MaybeCreateJob(request.get(), nullptr, nullptr));
   ASSERT_TRUE(job.get());
   ServiceWorkerWriteToCacheJob* sw_job =
       static_cast<ServiceWorkerWriteToCacheJob*>(job.get());
 
   histograms.ExpectUniqueSample(
       "ServiceWorker.ContextRequestHandlerStatus.NewWorker.MainScript",
       static_cast<int>(
           ServiceWorkerContextRequestHandler::CreateJobStatus::WRITE_JOB),
       1);
   // Verify that the request is properly annotated as originating from a
   // Service Worker.
   EXPECT_TRUE(ResourceRequestInfo::OriginatedFromServiceWorker(
       sw_job->net_request_.get()));
 }
 
 // Tests starting a service worker when the skip_service_worker flag is on. The
 // flag should be ignored.
 TEST_F(ServiceWorkerContextRequestHandlerTest,
        SkipServiceWorkerForServiceWorkerRequest) {
+  SetUpServiceWorker();
   // Conduct a resource fetch for the main script.
   version_->SetStatus(ServiceWorkerVersion::NEW);
   std::unique_ptr<net::URLRequest> request(CreateRequest(script_url_));
   ServiceWorkerRequestHandler::InitializeHandler(
       request.get(), helper_->context_wrapper(), &blob_storage_context_,
       helper_->mock_render_process_id(), provider_host_->provider_id(),
       true /* skip_service_worker */, FETCH_REQUEST_MODE_NO_CORS,
       FETCH_CREDENTIALS_MODE_OMIT, FetchRedirectMode::FOLLOW_MODE,
       RESOURCE_TYPE_SERVICE_WORKER, REQUEST_CONTEXT_TYPE_SERVICE_WORKER,
       REQUEST_CONTEXT_FRAME_TYPE_NONE, nullptr);
   // Verify a ServiceWorkerRequestHandler was created.
   ServiceWorkerRequestHandler* handler =
       ServiceWorkerRequestHandler::GetHandler(request.get());
   EXPECT_TRUE(handler);
 }
 
 TEST_F(ServiceWorkerContextRequestHandlerTest, NewWorker) {
+  SetUpServiceWorker();
   // Conduct a resource fetch for the main script.
   {
     base::HistogramTester histograms;
     std::unique_ptr<net::URLRequest> request(CreateRequest(script_url_));
     std::unique_ptr<ServiceWorkerContextRequestHandler> handler(
         CreateHandler(RESOURCE_TYPE_SERVICE_WORKER));
     std::unique_ptr<net::URLRequestJob> job(
         handler->MaybeCreateJob(request.get(), nullptr, nullptr));
     EXPECT_TRUE(job);
     histograms.ExpectUniqueSample(
@@ skipping 14 matching lines @@
     EXPECT_TRUE(job);
     histograms.ExpectUniqueSample(
         "ServiceWorker.ContextRequestHandlerStatus.NewWorker.ImportedScript",
         static_cast<int>(
             ServiceWorkerContextRequestHandler::CreateJobStatus::WRITE_JOB),
         1);
   }
 }
 
 TEST_F(ServiceWorkerContextRequestHandlerTest, InstalledWorker) {
+  SetUpServiceWorker();
   using Resource = ServiceWorkerDatabase::ResourceRecord;
   std::vector<Resource> resources = {
       Resource(context()->storage()->NewResourceId(), script_url_, 100),
       Resource(context()->storage()->NewResourceId(), import_script_url_, 100)};
   version_->script_cache_map()->SetResources(resources);
   version_->set_fetch_handler_existence(
       ServiceWorkerVersion::FetchHandlerExistence::EXISTS);
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   registration_->SetActiveVersion(version_);
 
@@ skipping 25 matching lines @@
     histograms.ExpectUniqueSample(
         "ServiceWorker.ContextRequestHandlerStatus.InstalledWorker."
         "ImportedScript",
         static_cast<int>(
             ServiceWorkerContextRequestHandler::CreateJobStatus::READ_JOB),
         1);
   }
 }
 
 TEST_F(ServiceWorkerContextRequestHandlerTest, Incumbent) {
+  SetUpServiceWorker();
   // Make an incumbent version.
   scoped_refptr<ServiceWorkerVersion> incumbent = new ServiceWorkerVersion(
       registration_.get(), script_url_, context()->storage()->NewVersionId(),
       context()->AsWeakPtr());
   incumbent->set_fetch_handler_existence(
       ServiceWorkerVersion::FetchHandlerExistence::EXISTS);
   std::vector<ServiceWorkerDatabase::ResourceRecord> resources = {
       ServiceWorkerDatabase::ResourceRecord(
           context()->storage()->NewResourceId(), script_url_, 100)};
   incumbent->script_cache_map()->SetResources(resources);
@@ skipping 11 matching lines @@
   std::unique_ptr<net::URLRequestJob> job(
       handler->MaybeCreateJob(request.get(), nullptr, nullptr));
   histograms.ExpectUniqueSample(
       "ServiceWorker.ContextRequestHandlerStatus.NewWorker.MainScript",
       static_cast<int>(ServiceWorkerContextRequestHandler::CreateJobStatus::
                            WRITE_JOB_WITH_INCUMBENT),
       1);
 }
 
 TEST_F(ServiceWorkerContextRequestHandlerTest, ErrorCases) {
+  SetUpServiceWorker();
   {
     // Set up a request.
     base::HistogramTester histograms;
     std::unique_ptr<net::URLRequest> request(CreateRequest(script_url_));
     InitializeHandler(request.get());
 
     // Make the version redundant.
     version_->SetStatus(ServiceWorkerVersion::REDUNDANT);
 
     // Verify that the request fails.
@@ skipping 48 matching lines @@
     EXPECT_EQ(net::ERR_FAILED, url_request_delegate_.request_status());
     histograms.ExpectUniqueSample(
         "ServiceWorker.ContextRequestHandlerStatus.NewWorker.MainScript",
         static_cast<int>(ServiceWorkerContextRequestHandler::CreateJobStatus::
                              ERROR_NO_CONTEXT),
         1);
   }
 }
 
 }  // namespace content