| Index: content/browser/service_worker/service_worker_controllee_request_handler.cc
|
| diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc
|
| index 6312b57b09bc3c6d5e4a54f71489cc3e338156e3..c64dd8aeaa76960e0b2b1ea27f63abb97163c779 100644
|
| --- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
|
| +++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
|
| @@ -33,7 +33,7 @@ bool MaybeForwardToServiceWorker(ServiceWorkerURLRequestJob* job,
|
| const ServiceWorkerVersion* version) {
|
| DCHECK(job);
|
| DCHECK(version);
|
| - if (version->has_fetch_handler()) {
|
| + if (version->has_fetch_handler().value()) {
|
| job->ForwardToServiceWorker();
|
| return true;
|
| }
|
| @@ -281,7 +281,8 @@ void ServiceWorkerControlleeRequestHandler::
|
| }
|
|
|
| ServiceWorkerMetrics::CountControlledPageLoad(
|
| - stripped_url_, active_version->has_fetch_handler(), is_main_frame_load_);
|
| + stripped_url_, active_version->has_fetch_handler().value(),
|
| + is_main_frame_load_);
|
|
|
| bool is_forwarded =
|
| MaybeForwardToServiceWorker(job_.get(), active_version.get());
|
| @@ -311,7 +312,7 @@ void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged(
|
| }
|
|
|
| ServiceWorkerMetrics::CountControlledPageLoad(
|
| - stripped_url_, version->has_fetch_handler(), is_main_frame_load_);
|
| + stripped_url_, version->has_fetch_handler().value(), is_main_frame_load_);
|
|
|
| provider_host_->AssociateRegistration(registration,
|
| false /* notify_controllerchange */);
|
|
|