Service Worker: Migrate to version_uuid and surface ServiceWorker.id. (Chromium 2/3)

content/browser/service_worker/service_worker_provider_host.cc

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 2afec926733e6fd41d72616118ebb2fe0f6eaf46..ca6eef1744f579a43c93da0ba8bdaf511448b19d 100644
--- a/content/browser/service_worker/service_worker_provider_host.cc
+++ b/content/browser/service_worker/service_worker_provider_host.cc
@@ -192,13 +192,13 @@ void ServiceWorkerProviderHost::SetControllerVersionAttribute(
       notify_controllerchange));
 }
 
-bool ServiceWorkerProviderHost::SetHostedVersionId(int64 version_id) {
+bool ServiceWorkerProviderHost::SetHostedVersionId(std::string version_uuid) {
   if (!context_)
     return true;  // System is shutting down.
   if (active_version())
     return false;  // Unexpected bad message.
 
-  ServiceWorkerVersion* live_version = context_->GetLiveVersion(version_id);
+  ServiceWorkerVersion* live_version = context_->GetLiveVersion(version_uuid);
   if (!live_version)
     return true;  // Was deleted before it got started.
 
@@ -365,7 +365,7 @@ ServiceWorkerProviderHost::GetOrCreateServiceWorkerHandle(
   if (!context_ || !version)
     return ServiceWorkerObjectInfo();
   ServiceWorkerHandle* handle = dispatcher_host_->FindServiceWorkerHandle(
-      provider_id(), version->version_id());
+      provider_id(), version->version_uuid());
   if (handle) {
     handle->IncrementRefCount();
     return handle->GetObjectInfo();