| Index: content/child/service_worker/web_service_worker_registration_impl.cc
|
| diff --git a/content/child/service_worker/web_service_worker_registration_impl.cc b/content/child/service_worker/web_service_worker_registration_impl.cc
|
| index 34be8bd86e14fec040709b7feb270b22c63d673a..0b4d8149a1f71d3ecaa92c01d5c09de010a8303e 100644
|
| --- a/content/child/service_worker/web_service_worker_registration_impl.cc
|
| +++ b/content/child/service_worker/web_service_worker_registration_impl.cc
|
| @@ -132,7 +132,7 @@ void WebServiceWorkerRegistrationImpl::update(
|
| ServiceWorkerDispatcher::GetThreadSpecificInstance();
|
| DCHECK(dispatcher);
|
| dispatcher->UpdateServiceWorker(provider_impl->provider_id(),
|
| - registration_id(), callbacks);
|
| + registrationId(), callbacks);
|
| }
|
|
|
| void WebServiceWorkerRegistrationImpl::unregister(
|
| @@ -144,7 +144,7 @@ void WebServiceWorkerRegistrationImpl::unregister(
|
| ServiceWorkerDispatcher::GetThreadSpecificInstance();
|
| DCHECK(dispatcher);
|
| dispatcher->UnregisterServiceWorker(provider_impl->provider_id(),
|
| - registration_id(), callbacks);
|
| + registrationId(), callbacks);
|
| }
|
|
|
| void WebServiceWorkerRegistrationImpl::enableNavigationPreload(
|
| @@ -157,7 +157,7 @@ void WebServiceWorkerRegistrationImpl::enableNavigationPreload(
|
| ServiceWorkerDispatcher::GetThreadSpecificInstance();
|
| DCHECK(dispatcher);
|
| dispatcher->EnableNavigationPreload(provider_impl->provider_id(),
|
| - registration_id(), enable,
|
| + registrationId(), enable,
|
| std::move(callbacks));
|
| }
|
|
|
| @@ -169,8 +169,8 @@ void WebServiceWorkerRegistrationImpl::getNavigationPreloadState(
|
| ServiceWorkerDispatcher* dispatcher =
|
| ServiceWorkerDispatcher::GetThreadSpecificInstance();
|
| DCHECK(dispatcher);
|
| - dispatcher->GetNavigationPreloadState(
|
| - provider_impl->provider_id(), registration_id(), std::move(callbacks));
|
| + dispatcher->GetNavigationPreloadState(provider_impl->provider_id(),
|
| + registrationId(), std::move(callbacks));
|
| }
|
|
|
| void WebServiceWorkerRegistrationImpl::setNavigationPreloadHeader(
|
| @@ -183,16 +183,12 @@ void WebServiceWorkerRegistrationImpl::setNavigationPreloadHeader(
|
| ServiceWorkerDispatcher::GetThreadSpecificInstance();
|
| DCHECK(dispatcher);
|
| dispatcher->SetNavigationPreloadHeader(provider_impl->provider_id(),
|
| - registration_id(), value.utf8(),
|
| + registrationId(), value.utf8(),
|
| std::move(callbacks));
|
| }
|
|
|
| -int64_t WebServiceWorkerRegistrationImpl::registration_id() const {
|
| - return handle_ref_->registration_id();
|
| -}
|
| -
|
| int64_t WebServiceWorkerRegistrationImpl::registrationId() const {
|
| - return registration_id();
|
| + return handle_ref_->registration_id();
|
| }
|
|
|
| // static
|
|
|