[WIP] Support opening an inspector window for ServiceWorker running on Android (chromium)

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 61 matching lines @@
     case content::ServiceWorkerVersion::ACTIVATED:
       return kServiceWorkerVersionStatusActivated;
     case content::ServiceWorkerVersion::REDUNDANT:
       return kServiceWorkerVersionStatusRedundant;
   }
   return "";
 }
 
 scoped_refptr<ServiceWorkerVersion> CreateVersionDictionaryValue(
     const ServiceWorkerVersionInfo& version_info) {
+  std::string workerId = "";
+  DevToolsAgentHostImpl* agent =
+      ServiceWorkerDevToolsManager::GetInstance()
+          ->GetDevToolsAgentHostForWorker(version_info.process_id,
+                                          version_info.devtools_agent_route_id);
+  if (agent)
+    workerId = agent->GetId();
   scoped_refptr<ServiceWorkerVersion> version(
       ServiceWorkerVersion::Create()
           ->set_version_id(base::Int64ToString(version_info.version_id))
           ->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()));
+                version_info.script_response_time.ToDoubleT())
+          ->set_worker_id(workerId));
   return version;
 }
 
 scoped_refptr<ServiceWorkerRegistration> CreateRegistrationDictionaryValue(
     const ServiceWorkerRegistrationInfo& registration_info) {
   scoped_refptr<ServiceWorkerRegistration> registration(
       ServiceWorkerRegistration::Create()
           ->set_registration_id(
                 base::Int64ToString(registration_info.registration_id))
           ->set_scope_url(registration_info.pattern.spec())
@@ skipping 226 matching lines @@
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&StopServiceWorkerOnIO, context_, id));
   return Response::OK();
 }
 
 Response ServiceWorkerHandler::InspectWorker(const std::string& version_id) {
   if (!enabled_)
     return Response::OK();
   if (!context_)
     return CreateContextErrorResoponse();
-
   int64 id = 0;
   if (!base::StringToInt64(version_id, &id))
     return CreateInvalidVersionIdErrorResoponse();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&GetDevToolsRouteInfoOnIO, context_, id,
                  base::Bind(&ServiceWorkerHandler::OpenNewDevToolsWindow,
                             weak_factory_.GetWeakPtr())));
   return Response::OK();
 }
 
+Response ServiceWorkerHandler::DetachWorker(const std::string& worker_id) {
+  if (!enabled_)
+    return Response::OK();
+  if (!context_)
+    return CreateContextErrorResoponse();
+  auto it = attached_hosts_.find(worker_id);
+  if (it == attached_hosts_.end())
+    return Response::OK();  // Already disconnected.
+  scoped_refptr<ServiceWorkerDevToolsAgentHost> host(it->second);
+  client_->WorkerTerminated(
+      WorkerTerminatedParams::Create()->set_worker_id(worker_id));
+  host->DetachClient();
+  attached_hosts_.erase(worker_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();
 }
 
 void ServiceWorkerHandler::OpenNewDevToolsWindow(int process_id,
                                                  int devtools_agent_route_id) {
   scoped_refptr<DevToolsAgentHostImpl> agent_host(
       ServiceWorkerDevToolsManager::GetInstance()
@@ skipping 108 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