| 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 ec881bf8f475aef479df7fccceb6d3d6f647dfab..7b64f97b3636616a41da816feaf672fa36bdcaf0 100644
|
| --- a/content/browser/service_worker/service_worker_browsertest.cc
|
| +++ b/content/browser/service_worker/service_worker_browsertest.cc
|
| @@ -571,8 +571,7 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest {
|
| ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| const GURL pattern = embedded_test_server()->GetURL("/service_worker/");
|
| registration_ = new ServiceWorkerRegistration(
|
| - pattern,
|
| - wrapper()->context()->storage()->NewRegistrationId(),
|
| + pattern, false, wrapper()->context()->storage()->NewRegistrationId(),
|
| wrapper()->context()->AsWeakPtr());
|
| // Set the update check time to avoid triggering updates in the middle of
|
| // tests.
|
| @@ -1308,7 +1307,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, FetchPageWithSaveData) {
|
| observer->Init();
|
| public_context()->RegisterServiceWorker(
|
| embedded_test_server()->GetURL(kPageUrl),
|
| - embedded_test_server()->GetURL(kWorkerUrl),
|
| + embedded_test_server()->GetURL(kWorkerUrl), false,
|
| base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
|
| observer->Wait();
|
|
|
| @@ -1350,7 +1349,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, CrossOriginFetchWithSaveData) {
|
| observer->Init();
|
| public_context()->RegisterServiceWorker(
|
| embedded_test_server()->GetURL(kPageUrl),
|
| - embedded_test_server()->GetURL(kWorkerUrl),
|
| + embedded_test_server()->GetURL(kWorkerUrl), false,
|
| base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
|
| observer->Wait();
|
|
|
| @@ -1393,7 +1392,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest,
|
|
|
| public_context()->RegisterServiceWorker(
|
| embedded_test_server()->GetURL(kPageUrl),
|
| - embedded_test_server()->GetURL(kWorkerUrl),
|
| + embedded_test_server()->GetURL(kWorkerUrl), false,
|
| base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
|
| observer->Wait();
|
|
|
| @@ -1419,7 +1418,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, Reload) {
|
| observer->Init();
|
| public_context()->RegisterServiceWorker(
|
| embedded_test_server()->GetURL(kPageUrl),
|
| - embedded_test_server()->GetURL(kWorkerUrl),
|
| + embedded_test_server()->GetURL(kWorkerUrl), false,
|
| base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
|
| observer->Wait();
|
|
|
| @@ -1493,7 +1492,7 @@ class ServiceWorkerNavigationPreloadTest : public ServiceWorkerBrowserTest {
|
| observer->Init();
|
|
|
| public_context()->RegisterServiceWorker(
|
| - scope, worker_url,
|
| + scope, worker_url, false,
|
| base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
|
| observer->Wait();
|
| }
|
| @@ -2203,8 +2202,7 @@ 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), false,
|
| base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
|
| observer->Wait();
|
|
|
| @@ -2240,7 +2238,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest,
|
| observer->Init();
|
| public_context()->RegisterServiceWorker(
|
| embedded_test_server()->GetURL(kPageUrl),
|
| - embedded_test_server()->GetURL(kWorkerUrl),
|
| + embedded_test_server()->GetURL(kWorkerUrl), false,
|
| base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
|
| observer->Wait();
|
|
|
| @@ -2353,7 +2351,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, Registration) {
|
| base::RunLoop run_loop;
|
| public_context()->RegisterServiceWorker(
|
| embedded_test_server()->GetURL(kScope),
|
| - embedded_test_server()->GetURL("/does/not/exist"),
|
| + embedded_test_server()->GetURL("/does/not/exist"), false,
|
| base::Bind(&ExpectResultAndRun, false, run_loop.QuitClosure()));
|
| run_loop.Run();
|
| }
|
| @@ -2364,7 +2362,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, Registration) {
|
| base::RunLoop run_loop;
|
| public_context()->RegisterServiceWorker(
|
| embedded_test_server()->GetURL(kScope),
|
| - embedded_test_server()->GetURL(kWorkerUrl),
|
| + embedded_test_server()->GetURL(kWorkerUrl), false,
|
| base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure()));
|
| run_loop.Run();
|
| }
|
| @@ -2376,7 +2374,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, Registration) {
|
| base::RunLoop run_loop;
|
| public_context()->RegisterServiceWorker(
|
| embedded_test_server()->GetURL(kScope),
|
| - embedded_test_server()->GetURL(kWorkerUrl),
|
| + embedded_test_server()->GetURL(kWorkerUrl), false,
|
| base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure()));
|
| run_loop.Run();
|
| }
|
| @@ -2685,7 +2683,7 @@ class ServiceWorkerV8CacheStrategiesTest : public ServiceWorkerBrowserTest {
|
| observer->Init();
|
| public_context()->RegisterServiceWorker(
|
| embedded_test_server()->GetURL(kPageUrl),
|
| - embedded_test_server()->GetURL(kWorkerUrl),
|
| + embedded_test_server()->GetURL(kWorkerUrl), false,
|
| base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
|
| observer->Wait();
|
| }
|
| @@ -2824,6 +2822,7 @@ class ServiceWorkerDisableWebSecurityTest : public ServiceWorkerBrowserTest {
|
| observer->Init();
|
| public_context()->RegisterServiceWorker(
|
| cross_origin_server_.GetURL(scope), cross_origin_server_.GetURL(script),
|
| + false,
|
| base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
|
| observer->Wait();
|
| }
|
|
|