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

content/browser/service_worker/embedded_worker_instance.cc

Index: content/browser/service_worker/embedded_worker_instance.cc
diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc
index f39dd626a6d394fccd8d9889c40758e23555d53c..48bae7eb9abdacf558ba0f23c8f335052c360fc8 100644
--- a/content/browser/service_worker/embedded_worker_instance.cc
+++ b/content/browser/service_worker/embedded_worker_instance.cc
@@ -57,7 +57,7 @@ void RegisterToWorkerDevToolsManagerOnUI(
     int process_id,
     const ServiceWorkerContextCore* service_worker_context,
     const base::WeakPtr<ServiceWorkerContextCore>& service_worker_context_weak,
-    int64 service_worker_version_id,
+    std::string service_worker_version_uuid,
     const GURL& url,
     const base::Callback<void(int worker_devtools_agent_route_id,
                               bool wait_for_debugger)>& callback) {
@@ -69,13 +69,10 @@ void RegisterToWorkerDevToolsManagerOnUI(
     worker_devtools_agent_route_id = rph->GetNextRoutingID();
     wait_for_debugger =
         ServiceWorkerDevToolsManager::GetInstance()->WorkerCreated(
-            process_id,
-            worker_devtools_agent_route_id,
+            process_id, worker_devtools_agent_route_id,
             ServiceWorkerDevToolsManager::ServiceWorkerIdentifier(
-                service_worker_context,
-                service_worker_context_weak,
-                service_worker_version_id,
-                url));
+                service_worker_context, service_worker_context_weak,
+                service_worker_version_uuid, url));
   }
   BrowserThread::PostTask(
       BrowserThread::IO,
@@ -132,7 +129,7 @@ EmbeddedWorkerInstance::~EmbeddedWorkerInstance() {
   registry_->RemoveWorker(process_id_, embedded_worker_id_);
 }
 
-void EmbeddedWorkerInstance::Start(int64 service_worker_version_id,
+void EmbeddedWorkerInstance::Start(std::string service_worker_version_uuid,
                                    const GURL& scope,
                                    const GURL& script_url,
                                    bool pause_after_download,
@@ -155,7 +152,7 @@ void EmbeddedWorkerInstance::Start(int64 service_worker_version_id,
                            "Scope", scope.spec(),
                            "Script URL", script_url.spec());
   params->embedded_worker_id = embedded_worker_id_;
-  params->service_worker_version_id = service_worker_version_id;
+  params->service_worker_version_uuid = service_worker_version_uuid;
   params->scope = scope;
   params->script_url = script_url;
   params->worker_devtools_agent_route_id = MSG_ROUTING_NONE;
@@ -270,7 +267,8 @@ void EmbeddedWorkerInstance::ProcessAllocated(
     FOR_EACH_OBSERVER(Listener, listener_list_, OnStopped(old_status));
     return;
   }
-  const int64 service_worker_version_id = params->service_worker_version_id;
+  const std::string service_worker_version_uuid =
+      params->service_worker_version_uuid;
   process_id_ = process_id;
   GURL script_url(params->script_url);
 
@@ -280,7 +278,7 @@ void EmbeddedWorkerInstance::ProcessAllocated(
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(RegisterToWorkerDevToolsManagerOnUI, process_id_,
-                 context_.get(), context_, service_worker_version_id,
+                 context_.get(), context_, service_worker_version_uuid,
                  script_url,
                  base::Bind(&EmbeddedWorkerInstance::SendStartWorker,
                             weak_factory_.GetWeakPtr(), base::Passed(&params),