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

content/browser/devtools/service_worker_devtools_agent_host.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/devtools/service_worker_devtools_agent_host.h"
 
 #include "base/strings/stringprintf.h"
 #include "content/browser/devtools/service_worker_devtools_manager.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_version.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 
 namespace content {
 
 namespace {
 
 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));
     }
   }
 }
 
 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);
   }
 }
 
 }  // namespace
 
 ServiceWorkerDevToolsAgentHost::ServiceWorkerDevToolsAgentHost(
     WorkerId worker_id,
     const ServiceWorkerIdentifier& service_worker)
     : WorkerDevToolsAgentHost(worker_id),
@@ skipping 17 matching lines @@
 }
 
 bool ServiceWorkerDevToolsAgentHost::Activate() {
   return false;
 }
 
 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;
 }
 
 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));
 }
 
 bool ServiceWorkerDevToolsAgentHost::Matches(
     const ServiceWorkerIdentifier& other) {
   return service_worker_->Matches(other);
 }
 
 ServiceWorkerDevToolsAgentHost::~ServiceWorkerDevToolsAgentHost() {
   ServiceWorkerDevToolsManager::GetInstance()->RemoveInspectedWorkerData(
       worker_id());
 }
 
 }  // namespace content