| Index: content/browser/service_worker/service_worker_provider_host.cc
|
| diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc
|
| index 2da7d3e66571aa1969e915ddc4c91dcec7d9b8b6..b65ab9b1823196619d11de09fc10ba20a89af550 100644
|
| --- a/content/browser/service_worker/service_worker_provider_host.cc
|
| +++ b/content/browser/service_worker/service_worker_provider_host.cc
|
| @@ -32,8 +32,8 @@ ServiceWorkerProviderHost::ServiceWorkerProviderHost(
|
| ServiceWorkerProviderHost::~ServiceWorkerProviderHost() {
|
| if (active_version_)
|
| active_version_->RemoveControllee(this);
|
| - if (pending_version_)
|
| - pending_version_->RemovePendingControllee(this);
|
| + if (waiting_version_)
|
| + waiting_version_->RemoveWaitingControllee(this);
|
| }
|
|
|
| void ServiceWorkerProviderHost::SetActiveVersion(
|
| @@ -63,16 +63,16 @@ void ServiceWorkerProviderHost::SetActiveVersion(
|
| kDocumentMainThreadId, provider_id(), info));
|
| }
|
|
|
| -void ServiceWorkerProviderHost::SetPendingVersion(
|
| +void ServiceWorkerProviderHost::SetWaitingVersion(
|
| ServiceWorkerVersion* version) {
|
| - if (version == pending_version_)
|
| + if (version == waiting_version_)
|
| return;
|
| - scoped_refptr<ServiceWorkerVersion> previous_version = pending_version_;
|
| - pending_version_ = version;
|
| + scoped_refptr<ServiceWorkerVersion> previous_version = waiting_version_;
|
| + waiting_version_ = version;
|
| if (version)
|
| - version->AddPendingControllee(this);
|
| + version->AddWaitingControllee(this);
|
| if (previous_version)
|
| - previous_version->RemovePendingControllee(this);
|
| + previous_version->RemoveWaitingControllee(this);
|
|
|
| if (!dispatcher_host_)
|
| return; // Could be NULL in some tests.
|
|
|