| Index: content/browser/service_worker/service_worker_register_job.h
|
| diff --git a/content/browser/service_worker/service_worker_register_job.h b/content/browser/service_worker/service_worker_register_job.h
|
| index 6a42b853bf42e0d3f34bf5c2c959b5d04d1f28b4..2d668ede249bd566d778f463d147ada7899db5a7 100644
|
| --- a/content/browser/service_worker/service_worker_register_job.h
|
| +++ b/content/browser/service_worker/service_worker_register_job.h
|
| @@ -57,10 +57,10 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase {
|
| virtual RegistrationJobType GetType() OVERRIDE;
|
|
|
| private:
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerProviderHostPendingVersionTest,
|
| - AssociatePendingVersionToDocuments);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerProviderHostPendingVersionTest,
|
| - DisassociatePendingVersionFromDocuments);
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerProviderHostWaitingVersionTest,
|
| + AssociateWaitingVersionToDocuments);
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerProviderHostWaitingVersionTest,
|
| + DisassociateWaitingVersionFromDocuments);
|
|
|
| enum Phase {
|
| INITIAL,
|
| @@ -79,6 +79,8 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase {
|
| Internal();
|
| ~Internal();
|
| scoped_refptr<ServiceWorkerRegistration> registration;
|
| +
|
| + // Holds 'installing' or 'waiting' version depending on the phase.
|
| scoped_refptr<ServiceWorkerVersion> pending_version;
|
| };
|
|
|
| @@ -106,14 +108,14 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase {
|
| ServiceWorkerRegistration* registration,
|
| ServiceWorkerVersion* version);
|
|
|
| - // Associates a pending version to documents matched with a scope of the
|
| + // Associates a waiting version to documents matched with a scope of the
|
| // version.
|
| - CONTENT_EXPORT static void AssociatePendingVersionToDocuments(
|
| + CONTENT_EXPORT static void AssociateWaitingVersionToDocuments(
|
| base::WeakPtr<ServiceWorkerContextCore> context,
|
| ServiceWorkerVersion* version);
|
|
|
| - // Disassociates a pending version specified by |version_id| from documents.
|
| - CONTENT_EXPORT static void DisassociatePendingVersionFromDocuments(
|
| + // Disassociates a waiting version specified by |version_id| from documents.
|
| + CONTENT_EXPORT static void DisassociateWaitingVersionFromDocuments(
|
| base::WeakPtr<ServiceWorkerContextCore> context,
|
| int64 version_id);
|
|
|
|
|