[DevTools] Pass session id in detach request

content/renderer/devtools/devtools_agent.cc

 // Copyright (c) 2012 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/renderer/devtools/devtools_agent.h"
 
 #include <stddef.h>
 
 #include <map>
 
@@ skipping 65 matching lines @@
 };
 
 typedef std::map<int, DevToolsAgent*> IdToAgentMap;
 base::LazyInstance<IdToAgentMap>::Leaky
     g_agent_for_routing_id = LAZY_INSTANCE_INITIALIZER;
 
 } //  namespace
 
 DevToolsAgent::DevToolsAgent(RenderFrameImpl* frame)
     : RenderFrameObserver(frame),
-      is_attached_(false),
       is_devtools_client_(false),
       paused_(false),
       frame_(frame),
       cpu_throttler_(new DevToolsCPUThrottler()),
       weak_factory_(this) {
   g_agent_for_routing_id.Get()[routing_id()] = this;
   frame_->GetWebFrame()->SetDevToolsAgentClient(this);
 }
 
 DevToolsAgent::~DevToolsAgent() {
@@ skipping 131 matching lines @@
     chunk.data = message.substr(pos, kMaxMessageChunkSize);
     sender->Send(new DevToolsClientMsg_DispatchOnInspectorFrontend(
                      routing_id, chunk));
     chunk.is_first = false;
     chunk.message_size = 0;
   }
 }
 
 void DevToolsAgent::OnAttach(const std::string& host_id, int session_id) {
   GetWebAgent()->Attach(WebString::FromUTF8(host_id), session_id);
-  is_attached_ = true;
+  session_ids_.insert(session_id);
 }
 
 void DevToolsAgent::OnReattach(const std::string& host_id,
                                int session_id,
                                const std::string& agent_state) {
   GetWebAgent()->Reattach(WebString::FromUTF8(host_id), session_id,
                           WebString::FromUTF8(agent_state));
-  is_attached_ = true;
+  session_ids_.insert(session_id);
 }
 
-void DevToolsAgent::OnDetach() {
-  GetWebAgent()->Detach();
-  is_attached_ = false;
+void DevToolsAgent::OnDetach(int session_id) {
+  GetWebAgent()->Detach(session_id);
+  session_ids_.erase(session_id);
 }
 
 void DevToolsAgent::OnDispatchOnInspectorBackend(int session_id,
                                                  int call_id,
                                                  const std::string& method,
                                                  const std::string& message) {
   TRACE_EVENT0("devtools", "DevToolsAgent::OnDispatchOnInspectorBackend");
   if (method == kPageGetAppManifest) {
     ManifestManager* manager = frame_->manifest_manager();
     manager->GetManifest(
@@ skipping 30 matching lines @@
     return;
   is_devtools_client_ = true;
   new DevToolsClient(frame_, compatibility_script);
 }
 
 WebDevToolsAgent* DevToolsAgent::GetWebAgent() {
   return frame_->GetWebFrame()->DevToolsAgent();
 }
 
 bool DevToolsAgent::IsAttached() {
-  return is_attached_;
+  return !!session_ids_.size();
+}
+
+void DevToolsAgent::DetachAllSessions() {
+  for (int session_id : session_ids_)
+    GetWebAgent()->Detach(session_id);
+  session_ids_.clear();
 }
 
 void DevToolsAgent::GotManifest(int session_id,
                                 int call_id,
                                 const GURL& manifest_url,
                                 const Manifest& manifest,
                                 const ManifestDebugInfo& debug_info) {
-  if (!is_attached_)
+  if (!IsAttached())
     return;
 
   std::unique_ptr<base::DictionaryValue> response(new base::DictionaryValue());
   response->SetInteger("id", call_id);
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
   std::unique_ptr<base::ListValue> errors(new base::ListValue());
 
   bool failed = false;
   for (const auto& error : debug_info.errors) {
     std::unique_ptr<base::DictionaryValue> error_value(
@@ skipping 15 matching lines @@
   result->Set("errors", errors.release());
   response->Set("result", result.release());
 
   std::string json_message;
   base::JSONWriter::Write(*response, &json_message);
   SendChunkedProtocolMessage(this, routing_id(), session_id, call_id,
                              json_message, std::string());
 }
 
 }  // namespace content