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(blink::WebServiceWorkerUpdateViaCache::kImports);
     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(
+      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(
             helper_->mock_render_process_id(),
             true /* is_parent_frame_secure */, version_.get(),
             context()->AsWeakPtr(), &remote_endpoint_);
     provider_host_ = host->AsWeakPtr();
     context()->AddProviderHost(std::move(host));
   }
 
@@ skipping 43 matching lines @@
 
 TEST_F(ServiceWorkerContextRequestHandlerTest, UpdateBefore24Hours) {
   // 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) {
+  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());
+  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) {
+  SetUpServiceWorker(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) {
+  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());
   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));
@@ skipping 226 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