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

content/browser/devtools/protocol/service_worker_handler.cc

 // Copyright 2015 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/protocol/service_worker_handler.h"
 
 #include "base/bind.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 90 matching lines @@
                SERVICE_WORKER_PROVIDER_FOR_SHARED_WORKER) {
       scoped_refptr<DevToolsAgentHost> agent_host(
           DevToolsAgentHost::GetForWorker(client.second.process_id,
                                           client.second.route_id));
       if (agent_host)
         clients.push_back(agent_host->GetId());
     }
   }
   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())
           ->set_running_status(
                 GetVersionRunningStatusString(version_info.running_status))
           ->set_status(GetVersionStatusString(version_info.status))
           ->set_script_last_modified(
                 version_info.script_last_modified.ToDoubleT())
           ->set_script_response_time(
                 version_info.script_response_time.ToDoubleT())
@@ skipping 49 matching lines @@
   }
   return result;
 }
 
 bool CollectURLs(std::set<GURL>* urls, FrameTreeNode* tree_node) {
   urls->insert(tree_node->current_url());
   return false;
 }
 
 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(
             callback, version->embedded_worker()->process_id(),
             version->embedded_worker()->worker_devtools_agent_route_id()));
   }
 }
 
 Response CreateContextErrorResponse() {
   return Response::InternalError("Could not connect to the context");
@@ skipping 156 matching lines @@
 
 Response ServiceWorkerHandler::StartWorker(const std::string& scope_url) {
   if (!enabled_)
     return Response::OK();
   if (!context_)
     return CreateContextErrorResponse();
   context_->StartServiceWorker(GURL(scope_url), base::Bind(&StatusNoOp));
   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));
   return Response::OK();
 }
 
 Response ServiceWorkerHandler::UpdateRegistration(
     const std::string& scope_url) {
   if (!enabled_)
     return Response::OK();
   if (!context_)
     return CreateContextErrorResponse();
   context_->UpdateRegistration(GURL(scope_url));
   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,
       base::Bind(&GetDevToolsRouteInfoOnIO, context_, id,
                  base::Bind(&ServiceWorkerHandler::OpenNewDevToolsWindow,
                             weak_factory_.GetWeakPtr())));
   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();
 }
 
 Response ServiceWorkerHandler::SetDebugOnStart(bool debug_on_start) {
   ServiceWorkerDevToolsManager::GetInstance()
       ->set_debug_service_worker_on_start(debug_on_start);
   return Response::OK();
 }
@@ skipping 67 matching lines @@
   std::vector<scoped_refptr<ServiceWorkerVersion>> version_values;
   for (const auto& version : versions) {
     version_values.push_back(CreateVersionDictionaryValue(version));
   }
   client_->WorkerVersionUpdated(
       WorkerVersionUpdatedParams::Create()->set_versions(version_values));
 }
 
 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)));
 }
 
 void ServiceWorkerHandler::DispatchProtocolMessage(
     DevToolsAgentHost* host,
     const std::string& message) {
 
   auto it = attached_hosts_.find(host->GetId());
@@ skipping 65 matching lines @@
     return;
   host->DetachClient();
   client_->WorkerTerminated(WorkerTerminatedParams::Create()->
       set_worker_id(host->GetId()));
   attached_hosts_.erase(it);
 }
 
 }  // namespace service_worker
 }  // namespace devtools
 }  // namespace content