| 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 e8499b0a30d39dd02669c04a7917c8f4d2ef72e2..64442b5bf60a80ec5135b3ec0dd4aa0aed6b2e44 100644
|
| --- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
|
| +++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
|
| @@ -102,7 +102,7 @@ net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob(
|
| void ServiceWorkerControlleeRequestHandler::GetExtraResponseInfo(
|
| bool* was_fetched_via_service_worker,
|
| GURL* original_url_via_service_worker) const {
|
| - if (!job_) {
|
| + if (!job_.get()) {
|
| *was_fetched_via_service_worker = false;
|
| *original_url_via_service_worker = GURL();
|
| return;
|
| @@ -136,7 +136,7 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
|
| job_->FallbackToNetwork();
|
| return;
|
| }
|
| - DCHECK(registration);
|
| + DCHECK(registration.get());
|
|
|
| ServiceWorkerMetrics::CountControlledPageLoad();
|
|
|
| @@ -151,7 +151,7 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
|
| registration->active_version();
|
|
|
| // Wait until it's activated before firing fetch events.
|
| - if (active_version &&
|
| + if (active_version.get() &&
|
| active_version->status() == ServiceWorkerVersion::ACTIVATING) {
|
| registration->active_version()->RegisterStatusChangeCallback(
|
| base::Bind(&self::OnVersionStatusChanged,
|
| @@ -161,13 +161,13 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
|
| return;
|
| }
|
|
|
| - if (!active_version ||
|
| + if (!active_version.get() ||
|
| active_version->status() != ServiceWorkerVersion::ACTIVATED) {
|
| job_->FallbackToNetwork();
|
| return;
|
| }
|
|
|
| - provider_host_->AssociateRegistration(registration);
|
| + provider_host_->AssociateRegistration(registration.get());
|
| job_->ForwardToServiceWorker();
|
| }
|
|
|
|
|