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

content/common/service_worker/service_worker_messages.h

Index: content/common/service_worker/service_worker_messages.h
diff --git a/content/common/service_worker/service_worker_messages.h b/content/common/service_worker/service_worker_messages.h
index a8ff04f6dd9b7853a0fa4b09b59160cffec45e8b..908ba887954649dc54849583efa20e2f736df96b 100644
--- a/content/common/service_worker/service_worker_messages.h
+++ b/content/common/service_worker/service_worker_messages.h
@@ -77,7 +77,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerObjectInfo)
   IPC_STRUCT_TRAITS_MEMBER(handle_id)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(state)
-  IPC_STRUCT_TRAITS_MEMBER(version_id)
+  IPC_STRUCT_TRAITS_MEMBER(version_uuid)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerRegistrationObjectInfo)
@@ -192,10 +192,10 @@ IPC_MESSAGE_CONTROL1(ServiceWorkerHostMsg_TerminateWorker,
 
 // Informs the browser that |provider_id| is associated
 // with a service worker script running context and
-// |version_id| identifies which ServiceWorkerVersion.
+// |version_uuid| identifies which ServiceWorkerVersion.
 IPC_MESSAGE_CONTROL2(ServiceWorkerHostMsg_SetVersionId,
                      int /* provider_id */,
-                     int64 /* version_id */)
+                     std::string /* version_uuid */)
 
 // Informs the browser that event handling has finished.
 // Routed to the target ServiceWorkerVersion.