| 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 5e8dc2f47ca5a9f45a70d1a30cec14ebc1ffb6de..222e19d775b52fa32a43a21a2d0019a350484ef1 100644
|
| --- a/content/browser/service_worker/service_worker_browsertest.cc
|
| +++ b/content/browser/service_worker/service_worker_browsertest.cc
|
| @@ -1408,6 +1408,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();
|
|
|
| @@ -1450,6 +1451,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();
|
|
|
| @@ -1493,6 +1495,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();
|
|
|
| @@ -1519,6 +1522,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();
|
|
|
| @@ -1592,7 +1596,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();
|
| }
|
| @@ -2297,8 +2301,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();
|
|
|
| @@ -2335,6 +2339,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();
|
|
|
| @@ -2448,6 +2453,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();
|
| }
|
| @@ -2459,6 +2465,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();
|
| }
|
| @@ -2471,6 +2478,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();
|
| }
|
|
|