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

content/browser/service_worker/service_worker_browsertest.cc

Index: content/browser/service_worker/service_worker_browsertest.cc
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 17cb6c4e11266b4739c69b3e1b8f7dd2d9dce3ab..8ea179ef1b3a6c0bd3bb3f36719bff5036da5446 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -641,7 +641,7 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest {
     ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
     const GURL pattern = embedded_test_server()->GetURL("/service_worker/");
     registration_ = new ServiceWorkerRegistration(
-        pattern,
+        ServiceWorkerRegistrationOptions(pattern),
         wrapper()->context()->storage()->NewRegistrationId(),
         wrapper()->context()->AsWeakPtr());
     // Set the update check time to avoid triggering updates in the middle of
@@ -1406,6 +1406,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, FetchPageWithSaveData) {
   public_context()->RegisterServiceWorker(
       embedded_test_server()->GetURL(kPageUrl),
       embedded_test_server()->GetURL(kWorkerUrl),
+      blink::WebServiceWorkerUpdateViaCache::kImports,
       base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
   observer->Wait();
 
@@ -1448,6 +1449,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, CrossOriginFetchWithSaveData) {
   public_context()->RegisterServiceWorker(
       embedded_test_server()->GetURL(kPageUrl),
       embedded_test_server()->GetURL(kWorkerUrl),
+      blink::WebServiceWorkerUpdateViaCache::kImports,
       base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
   observer->Wait();
 
@@ -1491,6 +1493,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest,
   public_context()->RegisterServiceWorker(
       embedded_test_server()->GetURL(kPageUrl),
       embedded_test_server()->GetURL(kWorkerUrl),
+      blink::WebServiceWorkerUpdateViaCache::kImports,
       base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
   observer->Wait();
 
@@ -1517,6 +1520,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, Reload) {
   public_context()->RegisterServiceWorker(
       embedded_test_server()->GetURL(kPageUrl),
       embedded_test_server()->GetURL(kWorkerUrl),
+      blink::WebServiceWorkerUpdateViaCache::kImports,
       base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
   observer->Wait();
 
@@ -1590,7 +1594,7 @@ class ServiceWorkerNavigationPreloadTest : public ServiceWorkerBrowserTest {
     observer->Init();
 
     public_context()->RegisterServiceWorker(
-        scope, worker_url,
+        scope, worker_url, blink::WebServiceWorkerUpdateViaCache::kImports,
         base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
     observer->Wait();
   }
@@ -2295,8 +2299,8 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest,
       new WorkerActivatedObserver(wrapper());
   observer->Init();
   public_context()->RegisterServiceWorker(
-      https_server.GetURL(kPageUrl),
-      https_server.GetURL(kWorkerUrl),
+      https_server.GetURL(kPageUrl), https_server.GetURL(kWorkerUrl),
+      blink::WebServiceWorkerUpdateViaCache::kImports,
       base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
   observer->Wait();
 
@@ -2333,6 +2337,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest,
   public_context()->RegisterServiceWorker(
       embedded_test_server()->GetURL(kPageUrl),
       embedded_test_server()->GetURL(kWorkerUrl),
+      blink::WebServiceWorkerUpdateViaCache::kImports,
       base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
   observer->Wait();
 
@@ -2446,6 +2451,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, Registration) {
     public_context()->RegisterServiceWorker(
         embedded_test_server()->GetURL(kScope),
         embedded_test_server()->GetURL("/does/not/exist"),
+        blink::WebServiceWorkerUpdateViaCache::kImports,
         base::Bind(&ExpectResultAndRun, false, run_loop.QuitClosure()));
     run_loop.Run();
   }
@@ -2457,6 +2463,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, Registration) {
     public_context()->RegisterServiceWorker(
         embedded_test_server()->GetURL(kScope),
         embedded_test_server()->GetURL(kWorkerUrl),
+        blink::WebServiceWorkerUpdateViaCache::kImports,
         base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure()));
     run_loop.Run();
   }
@@ -2469,6 +2476,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, Registration) {
     public_context()->RegisterServiceWorker(
         embedded_test_server()->GetURL(kScope),
         embedded_test_server()->GetURL(kWorkerUrl),
+        blink::WebServiceWorkerUpdateViaCache::kImports,
         base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure()));
     run_loop.Run();
   }
@@ -2778,6 +2786,7 @@ class ServiceWorkerV8CacheStrategiesTest : public ServiceWorkerBrowserTest {
     public_context()->RegisterServiceWorker(
         embedded_test_server()->GetURL(kPageUrl),
         embedded_test_server()->GetURL(kWorkerUrl),
+        blink::WebServiceWorkerUpdateViaCache::kImports,
         base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
     observer->Wait();
   }
@@ -2916,6 +2925,7 @@ class ServiceWorkerDisableWebSecurityTest : public ServiceWorkerBrowserTest {
     observer->Init();
     public_context()->RegisterServiceWorker(
         cross_origin_server_.GetURL(scope), cross_origin_server_.GetURL(script),
+        blink::WebServiceWorkerUpdateViaCache::kImports,
         base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
     observer->Wait();
   }