| 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 69ffa22cbfea8504f31ea41c8e37a9f4f9ebc2a3..18ca38c9496f7f43f05f6db2544c08af61ec3484 100644
|
| --- a/content/browser/service_worker/service_worker_context_wrapper.cc
|
| +++ b/content/browser/service_worker/service_worker_context_wrapper.cc
|
| @@ -479,13 +479,13 @@ void ServiceWorkerContextWrapper::DidGetAllRegistrationsForGetAllOrigins(
|
| callback.Run(usage_infos);
|
| }
|
|
|
| -void ServiceWorkerContextWrapper::DidCheckHasServiceWorker(
|
| - const CheckHasServiceWorkerCallback& callback,
|
| - bool has_service_worker) {
|
| +void ServiceWorkerContextWrapper::DidCheckServiceWorkerStatus(
|
| + const CheckServiceWorkerStatusCallback& callback,
|
| + ServiceWorkerStatus sw_status) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
| BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| - base::Bind(callback, has_service_worker));
|
| + base::Bind(callback, sw_status));
|
| }
|
|
|
| void ServiceWorkerContextWrapper::StopAllServiceWorkersForOrigin(
|
| @@ -558,26 +558,27 @@ void ServiceWorkerContextWrapper::DeleteForOrigin(
|
| origin.GetOrigin(), base::Bind(&StatusCodeToBoolCallbackAdapter, result));
|
| }
|
|
|
| -void ServiceWorkerContextWrapper::CheckHasServiceWorker(
|
| +void ServiceWorkerContextWrapper::CheckServiceWorkerStatus(
|
| const GURL& url,
|
| const GURL& other_url,
|
| - const CheckHasServiceWorkerCallback& callback) {
|
| + const CheckServiceWorkerStatusCallback& callback) {
|
| if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
|
| BrowserThread::PostTask(
|
| BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&ServiceWorkerContextWrapper::CheckHasServiceWorker, this,
|
| + base::Bind(&ServiceWorkerContextWrapper::CheckServiceWorkerStatus, this,
|
| url, other_url, callback));
|
| return;
|
| }
|
| if (!context_core_) {
|
| - BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| - base::Bind(callback, false));
|
| + BrowserThread::PostTask(
|
| + BrowserThread::UI, FROM_HERE,
|
| + base::Bind(callback, ServiceWorkerStatus::NO_SERVICE_WORKER));
|
| return;
|
| }
|
| - context()->CheckHasServiceWorker(
|
| + context()->CheckServiceWorkerStatus(
|
| net::SimplifyUrlForRequest(url), net::SimplifyUrlForRequest(other_url),
|
| - base::Bind(&ServiceWorkerContextWrapper::DidCheckHasServiceWorker, this,
|
| - callback));
|
| + base::Bind(&ServiceWorkerContextWrapper::DidCheckServiceWorkerStatus,
|
| + this, callback));
|
| }
|
|
|
| void ServiceWorkerContextWrapper::CountExternalRequestsForTest(
|
|
|