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

content/browser/service_worker/service_worker_context_request_handler_unittest.cc

Index: content/browser/service_worker/service_worker_context_request_handler_unittest.cc
diff --git a/content/browser/service_worker/service_worker_context_request_handler_unittest.cc b/content/browser/service_worker/service_worker_context_request_handler_unittest.cc
index 87d418f020f4413e9d98e2e0170097a0751398bf..3d76441329064a361d09f57ddb6df3bcaa9f5133 100644
--- a/content/browser/service_worker/service_worker_context_request_handler_unittest.cc
+++ b/content/browser/service_worker/service_worker_context_request_handler_unittest.cc
@@ -61,15 +61,12 @@ class ServiceWorkerContextRequestHandlerTest : public testing::Test {
     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(blink::WebServiceWorkerUpdateViaCache::kImports);
     SetUpProvider();
 
     std::unique_ptr<MockHttpProtocolHandler> handler(
@@ -87,6 +84,19 @@ class ServiceWorkerContextRequestHandlerTest : public testing::Test {
 
   ServiceWorkerContextCore* context() const { return helper_->context(); }
 
+  void SetUpServiceWorker(
+      blink::WebServiceWorkerUpdateViaCache update_via_cache) {
+    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(
@@ -147,6 +157,33 @@ TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateBefore24Hours) {
   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) {
+  SetUpServiceWorker(blink::WebServiceWorkerUpdateViaCache::kAll);
+  // 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_));
@@ -167,7 +204,8 @@ TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateBefore24Hours) {
   EXPECT_FALSE(sw_job->net_request_->load_flags() & net::LOAD_BYPASS_CACHE);
 }
 
-TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateAfter24Hours) {
+TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateAfter24HoursUsingCache) {
+  SetUpServiceWorker(blink::WebServiceWorkerUpdateViaCache::kAll);
   // Give the registration a old update time and pretend
   // we're installing a new version.
   registration_->set_last_update_check(
@@ -195,6 +233,7 @@ TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateAfter24Hours) {
 }
 
 TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateForceBypassCache) {
+  SetUpServiceWorker(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());