| 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 148ce443174481e11b288cbd84d5374aa2bbea08..4e5d18cff22cb220c0af0034b780e27e75d8fcda 100644
|
| --- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
|
| +++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
|
| @@ -77,7 +77,7 @@ void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(
|
| // The corresponding provider_host may already have associate version in
|
| // redirect case, unassociate it now.
|
| provider_host_->SetActiveVersion(NULL);
|
| - provider_host_->SetPendingVersion(NULL);
|
| + provider_host_->SetWaitingVersion(NULL);
|
| provider_host_->set_document_url(url);
|
| context_->storage()->FindRegistrationForDocument(
|
| url,
|
| @@ -95,12 +95,12 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
|
| job_->FallbackToNetwork();
|
| return;
|
| }
|
| - // TODO(michaeln): should SetPendingVersion() even if no active version so
|
| + // TODO(michaeln): should SetWaitingVersion() even if no active version so
|
| // so the versions in the pipeline (.installing, .waiting) show up in the
|
| // attribute values.
|
| DCHECK(registration);
|
| provider_host_->SetActiveVersion(registration->active_version());
|
| - provider_host_->SetPendingVersion(registration->pending_version());
|
| + provider_host_->SetWaitingVersion(registration->waiting_version());
|
| job_->ForwardToServiceWorker();
|
| }
|
|
|
|
|