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

content/browser/devtools/protocol/service_worker_handler.cc

Index: content/browser/devtools/protocol/service_worker_handler.cc
diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc
index b35a254f10f1b83411595b5ee88e292e4df08daa..5e296c77ad08b2d5b43202e9bfa93c397803f27b 100644
--- a/content/browser/devtools/protocol/service_worker_handler.cc
+++ b/content/browser/devtools/protocol/service_worker_handler.cc
@@ -108,7 +108,7 @@ scoped_refptr<ServiceWorkerVersion> CreateVersionDictionaryValue(
   }
   scoped_refptr<ServiceWorkerVersion> version(
       ServiceWorkerVersion::Create()
-          ->set_version_id(base::Int64ToString(version_info.version_id))
+          ->set_version_id(version_info.version_uuid)
           ->set_registration_id(
                 base::Int64ToString(version_info.registration_id))
           ->set_script_url(version_info.script_url.spec())
@@ -178,19 +178,19 @@ bool CollectURLs(std::set<GURL>* urls, FrameTreeNode* tree_node) {
 }
 
 void StopServiceWorkerOnIO(scoped_refptr<ServiceWorkerContextWrapper> context,
-                           int64 version_id) {
+                           std::string version_uuid) {
   if (content::ServiceWorkerVersion* version =
-          context->GetLiveVersion(version_id)) {
+          context->GetLiveVersion(version_uuid)) {
     version->StopWorker(base::Bind(&StatusNoOp));
   }
 }
 
 void GetDevToolsRouteInfoOnIO(
     scoped_refptr<ServiceWorkerContextWrapper> context,
-    int64 version_id,
+    std::string version_uuid,
     const base::Callback<void(int, int)>& callback) {
   if (content::ServiceWorkerVersion* version =
-          context->GetLiveVersion(version_id)) {
+          context->GetLiveVersion(version_uuid)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(
@@ -367,13 +367,13 @@ Response ServiceWorkerHandler::StartWorker(const std::string& scope_url) {
   return Response::OK();
 }
 
-Response ServiceWorkerHandler::StopWorker(const std::string& version_id) {
+Response ServiceWorkerHandler::StopWorker(const std::string& version_uuid) {
   if (!enabled_)
     return Response::OK();
   if (!context_)
     return CreateContextErrorResponse();
-  int64 id = 0;
-  if (!base::StringToInt64(version_id, &id))
+  std::string id(version_uuid);
+  if (id.empty())
     return CreateInvalidVersionIdErrorResponse();
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&StopServiceWorkerOnIO, context_, id));
@@ -390,14 +390,14 @@ Response ServiceWorkerHandler::UpdateRegistration(
   return Response::OK();
 }
 
-Response ServiceWorkerHandler::InspectWorker(const std::string& version_id) {
+Response ServiceWorkerHandler::InspectWorker(const std::string& version_uuid) {
   if (!enabled_)
     return Response::OK();
   if (!context_)
     return CreateContextErrorResponse();
 
-  int64 id = 0;
-  if (!base::StringToInt64(version_id, &id))
+  std::string id(version_uuid);
+  if (id.empty())
     return CreateInvalidVersionIdErrorResponse();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ -407,14 +407,14 @@ Response ServiceWorkerHandler::InspectWorker(const std::string& version_id) {
   return Response::OK();
 }
 
-Response ServiceWorkerHandler::SkipWaiting(const std::string& version_id) {
+Response ServiceWorkerHandler::SkipWaiting(const std::string& version_uuid) {
   if (!enabled_)
     return Response::OK();
   if (!context_)
     return CreateContextErrorResponse();
 
-  int64 id = 0;
-  if (!base::StringToInt64(version_id, &id))
+  std::string id(version_uuid);
+  if (id.empty())
     return CreateInvalidVersionIdErrorResponse();
   context_->SimulateSkipWaiting(id);
   return Response::OK();
@@ -502,14 +502,14 @@ void ServiceWorkerHandler::OnWorkerVersionUpdated(
 
 void ServiceWorkerHandler::OnErrorReported(
     int64 registration_id,
-    int64 version_id,
+    std::string version_uuid,
     const ServiceWorkerContextObserver::ErrorInfo& info) {
   client_->WorkerErrorReported(
       WorkerErrorReportedParams::Create()->set_error_message(
           ServiceWorkerErrorMessage::Create()
               ->set_error_message(base::UTF16ToUTF8(info.error_message))
               ->set_registration_id(base::Int64ToString(registration_id))
-              ->set_version_id(base::Int64ToString(version_id))
+              ->set_version_id(version_uuid)
               ->set_source_url(info.source_url.spec())
               ->set_line_number(info.line_number)
               ->set_column_number(info.column_number)));