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

content/browser/devtools/service_worker_devtools_agent_host.cc

Index: content/browser/devtools/service_worker_devtools_agent_host.cc
diff --git a/content/browser/devtools/service_worker_devtools_agent_host.cc b/content/browser/devtools/service_worker_devtools_agent_host.cc
index fd491b07b8b4ced4e36a28ed640ed8575cc93316..9ed9aeb32932f06b17fc85f4bee3f85aa3462faa 100644
--- a/content/browser/devtools/service_worker_devtools_agent_host.cc
+++ b/content/browser/devtools/service_worker_devtools_agent_host.cc
@@ -19,18 +19,18 @@ void StatusNoOp(ServiceWorkerStatusCode status) {}
 
 void TerminateServiceWorkerOnIO(
     base::WeakPtr<ServiceWorkerContextCore> context_weak,
-    int64 version_id) {
+    std::string version_uuid) {
   if (ServiceWorkerContextCore* context = context_weak.get()) {
-    if (ServiceWorkerVersion* version = context->GetLiveVersion(version_id))
+    if (ServiceWorkerVersion* version = context->GetLiveVersion(version_uuid))
       version->StopWorker(base::Bind(&StatusNoOp));
   }
 }
 
 void UnregisterServiceWorkerOnIO(
     base::WeakPtr<ServiceWorkerContextCore> context_weak,
-    int64 version_id) {
+    std::string version_uuid) {
   if (ServiceWorkerContextCore* context = context_weak.get()) {
-    if (ServiceWorkerVersion* version = context->GetLiveVersion(version_id)) {
+    if (ServiceWorkerVersion* version = context->GetLiveVersion(version_uuid)) {
         version->StopWorker(base::Bind(&StatusNoOp));
         context->UnregisterServiceWorker(
             version->scope(), base::Bind(&StatusNoOp));
@@ -40,10 +40,10 @@ void UnregisterServiceWorkerOnIO(
 
 void SetDevToolsAttachedOnIO(
     base::WeakPtr<ServiceWorkerContextCore> context_weak,
-    int64 version_id,
+    std::string version_uuid,
     bool attached) {
   if (ServiceWorkerContextCore* context = context_weak.get()) {
-    if (ServiceWorkerVersion* version = context->GetLiveVersion(version_id))
+    if (ServiceWorkerVersion* version = context->GetLiveVersion(version_uuid))
       version->SetDevToolsAttached(attached);
   }
 }
@@ -81,7 +81,7 @@ bool ServiceWorkerDevToolsAgentHost::Close() {
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&TerminateServiceWorkerOnIO,
                   service_worker_->context_weak(),
-                  service_worker_->version_id()));
+                  service_worker_->version_uuid()));
   return true;
 }
 
@@ -89,14 +89,14 @@ void ServiceWorkerDevToolsAgentHost::UnregisterWorker() {
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&UnregisterServiceWorkerOnIO,
                   service_worker_->context_weak(),
-                  service_worker_->version_id()));
+                  service_worker_->version_uuid()));
 }
 
 void ServiceWorkerDevToolsAgentHost::OnAttachedStateChanged(bool attached) {
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&SetDevToolsAttachedOnIO,
                   service_worker_->context_weak(),
-                  service_worker_->version_id(),
+                  service_worker_->version_uuid(),
                   attached));
 }