| Index: content/browser/service_worker/service_worker_context_wrapper.cc
|
| diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
|
| index fbb00d4fc0fd42a3bd650f6ce2cb7cc28cbcfdd0..e16f4cbf0301850ca372be89d47fcd9ac7f026b5 100644
|
| --- a/content/browser/service_worker/service_worker_context_wrapper.cc
|
| +++ b/content/browser/service_worker/service_worker_context_wrapper.cc
|
| @@ -221,16 +221,13 @@ static void FinishRegistrationOnIO(
|
| void ServiceWorkerContextWrapper::RegisterServiceWorker(
|
| const GURL& pattern,
|
| const GURL& script_url,
|
| + blink::WebServiceWorkerUpdateViaCache update_via_cache,
|
| const ResultCallback& continuation) {
|
| if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
|
| BrowserThread::PostTask(
|
| - BrowserThread::IO,
|
| - FROM_HERE,
|
| - base::Bind(&ServiceWorkerContextWrapper::RegisterServiceWorker,
|
| - this,
|
| - pattern,
|
| - script_url,
|
| - continuation));
|
| + BrowserThread::IO, FROM_HERE,
|
| + base::Bind(&ServiceWorkerContextWrapper::RegisterServiceWorker, this,
|
| + pattern, script_url, update_via_cache, continuation));
|
| return;
|
| }
|
| if (!context_core_) {
|
| @@ -238,9 +235,10 @@ void ServiceWorkerContextWrapper::RegisterServiceWorker(
|
| base::Bind(continuation, false));
|
| return;
|
| }
|
| + ServiceWorkerRegistrationOptions options(net::SimplifyUrlForRequest(pattern),
|
| + update_via_cache);
|
| context()->RegisterServiceWorker(
|
| - net::SimplifyUrlForRequest(pattern),
|
| - net::SimplifyUrlForRequest(script_url), NULL /* provider_host */,
|
| + net::SimplifyUrlForRequest(script_url), options, NULL /* provider_host */,
|
| base::Bind(&FinishRegistrationOnIO, continuation));
|
| }
|
|
|
|
|