Index: content/browser/service_worker/service_worker_context_core.h |
diff --git a/content/browser/service_worker/service_worker_context_core.h b/content/browser/service_worker/service_worker_context_core.h |
index ecffaca878c414174b0822effb9f8cd1e1c12c04..dfcae781a2520172b40fe11be245052eabb28282 100644 |
--- a/content/browser/service_worker/service_worker_context_core.h |
+++ b/content/browser/service_worker/service_worker_context_core.h |
@@ -192,10 +192,10 @@ class CONTENT_EXPORT ServiceWorkerContextCore |
const { |
return live_registrations_; |
} |
- ServiceWorkerVersion* GetLiveVersion(int64 version_id); |
+ ServiceWorkerVersion* GetLiveVersion(std::string version_uuid); |
void AddLiveVersion(ServiceWorkerVersion* version); |
- void RemoveLiveVersion(int64 registration_id); |
- const std::map<int64, ServiceWorkerVersion*>& GetLiveVersions() const { |
+ void RemoveLiveVersion(std::string version_uuid); |
+ const std::map<std::string, ServiceWorkerVersion*>& GetLiveVersions() const { |
return live_versions_; |
} |
@@ -205,7 +205,7 @@ class CONTENT_EXPORT ServiceWorkerContextCore |
// ProtectVersion holds a reference to |version| until UnprotectVersion is |
// called. |
void ProtectVersion(const scoped_refptr<ServiceWorkerVersion>& version); |
- void UnprotectVersion(int64 version_id); |
+ void UnprotectVersion(std::string version_uuid); |
// Returns new context-local unique ID. |
int GetNewServiceWorkerHandleId(); |
@@ -233,7 +233,7 @@ class CONTENT_EXPORT ServiceWorkerContextCore |
private: |
friend class ServiceWorkerContext; |
typedef std::map<int64, ServiceWorkerRegistration*> RegistrationsMap; |
- typedef std::map<int64, ServiceWorkerVersion*> VersionMap; |
+ typedef std::map<std::string, ServiceWorkerVersion*> VersionMap; |
ProviderMap* GetProviderMapForProcess(int process_id) { |
return providers_->Lookup(process_id); |
@@ -265,8 +265,9 @@ class CONTENT_EXPORT ServiceWorkerContextCore |
scoped_refptr<EmbeddedWorkerRegistry> embedded_worker_registry_; |
scoped_ptr<ServiceWorkerJobCoordinator> job_coordinator_; |
std::map<int64, ServiceWorkerRegistration*> live_registrations_; |
- std::map<int64, ServiceWorkerVersion*> live_versions_; |
- std::map<int64, scoped_refptr<ServiceWorkerVersion>> protected_versions_; |
+ std::map<std::string, ServiceWorkerVersion*> live_versions_; |
+ std::map<std::string, scoped_refptr<ServiceWorkerVersion>> |
+ protected_versions_; |
int next_handle_id_; |
int next_registration_handle_id_; |
scoped_refptr<base::ObserverListThreadSafe<ServiceWorkerContextObserver>> |