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

content/browser/service_worker/service_worker_version.cc

Index: content/browser/service_worker/service_worker_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index 0c3fedb14f76a46b659781a10ad2892beeeda60b..0e3ef83ffb012a2454367e9d573443f294af0a18 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -471,9 +471,9 @@ class ServiceWorkerVersion::PingController {
 ServiceWorkerVersion::ServiceWorkerVersion(
     ServiceWorkerRegistration* registration,
     const GURL& script_url,
-    int64 version_id,
+    std::string version_uuid,
     base::WeakPtr<ServiceWorkerContextCore> context)
-    : version_id_(version_id),
+    : version_uuid_(version_uuid),
       registration_id_(registration->id()),
       script_url_(script_url),
       scope_(registration->pattern()),
@@ -500,7 +500,7 @@ ServiceWorkerVersion::~ServiceWorkerVersion() {
   }
 
   if (context_)
-    context_->RemoveLiveVersion(version_id_);
+    context_->RemoveLiveVersion(version_uuid_);
 
   if (running_status() == STARTING || running_status() == RUNNING)
     embedded_worker_->Stop();
@@ -535,8 +535,9 @@ void ServiceWorkerVersion::RegisterStatusChangeCallback(
 ServiceWorkerVersionInfo ServiceWorkerVersion::GetInfo() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   ServiceWorkerVersionInfo info(
-      running_status(), status(), script_url(), registration_id(), version_id(),
-      embedded_worker()->process_id(), embedded_worker()->thread_id(),
+      running_status(), status(), script_url(), registration_id(),
+      version_uuid(), embedded_worker()->process_id(),
+      embedded_worker()->thread_id(),
       embedded_worker()->worker_devtools_agent_route_id());
   for (const auto& controllee : controllee_map_) {
     const ServiceWorkerProviderHost* host = controllee.second;
@@ -1759,7 +1760,7 @@ void ServiceWorkerVersion::StartWorkerInternal(bool pause_after_download) {
     StartTimeoutTimer();
   if (running_status() == STOPPED) {
     embedded_worker_->Start(
-        version_id_, scope_, script_url_, pause_after_download,
+        version_uuid_, scope_, script_url_, pause_after_download,
         base::Bind(&ServiceWorkerVersion::OnStartSentAndScriptEvaluated,
                    weak_factory_.GetWeakPtr()));
   }
@@ -2107,7 +2108,7 @@ void ServiceWorkerVersion::FoundRegistrationForUpdate(
 
   const scoped_refptr<ServiceWorkerVersion> protect = this;
   if (is_update_scheduled_) {
-    context_->UnprotectVersion(version_id_);
+    context_->UnprotectVersion(version_uuid_);
     is_update_scheduled_ = false;
   }