DevTools: retain DTAH in all the targets to match their life time.

content/browser/devtools/devtools_http_handler.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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <utility>
 
@@ skipping 517 matching lines @@
     version.SetString("V8-Version", V8_VERSION_STRING);
 #if defined(OS_ANDROID)
     version.SetString("Android-Package",
         base::android::BuildInfo::GetInstance()->package_name());
 #endif
     SendJson(connection_id, net::HTTP_OK, &version, std::string());
     return;
   }
 
   if (command == "list") {
-    DevToolsAgentHost::DiscoverAllHosts(
-        base::Bind(&DevToolsHttpHandler::RespondToJsonList,
-                   weak_factory_.GetWeakPtr(), connection_id,
-                   info.headers["host"]));
+    DevToolsManager* manager = DevToolsManager::GetInstance();
+    DevToolsAgentHost::List list =
+        manager->delegate() ? manager->delegate()->RemoteDebuggingTargets()
+                            : DevToolsAgentHost::GetOrCreateAll();
+    RespondToJsonList(connection_id, info.headers["host"], std::move(list));
     return;
   }
 
   if (command == "new") {
     GURL url(net::UnescapeURLComponent(
         query, net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS |
                    net::UnescapeRule::PATH_SEPARATORS));
     if (!url.is_valid())
       url = GURL(url::kAboutBlankURL);
     scoped_refptr<DevToolsAgentHost> agent_host = nullptr;
     agent_host = delegate_->CreateNewTarget(url);
     if (!agent_host) {
       SendJson(connection_id,
                net::HTTP_INTERNAL_SERVER_ERROR,
                NULL,
                "Could not create new page");
       return;
     }
     std::string host = info.headers["host"];
     std::unique_ptr<base::DictionaryValue> dictionary(
         SerializeDescriptor(agent_host, host));
     SendJson(connection_id, net::HTTP_OK, dictionary.get(), std::string());
-    const std::string target_id = agent_host->GetId();
-    agent_host_map_[target_id] = agent_host;
     return;
   }
 
   if (command == "activate" || command == "close") {
-    scoped_refptr<DevToolsAgentHost> agent_host = GetAgentHost(target_id);
+    scoped_refptr<DevToolsAgentHost> agent_host =
+        DevToolsAgentHost::GetForId(target_id);
     if (!agent_host) {
       SendJson(connection_id,
                net::HTTP_NOT_FOUND,
                NULL,
                "No such target id: " + target_id);
       return;
     }
 
     if (command == "activate") {
       if (agent_host->Activate()) {
@@ skipping 25 matching lines @@
            "Unknown command: " + command);
   return;
 }
 
 void DevToolsHttpHandler::RespondToJsonList(
     int connection_id,
     const std::string& host,
     DevToolsAgentHost::List hosts) {
   DevToolsAgentHost::List agent_hosts = std::move(hosts);
   std::sort(agent_hosts.begin(), agent_hosts.end(), TimeComparator);
-  agent_host_map_.clear();
   base::ListValue list_value;
-  for (auto& agent_host : agent_hosts) {
-    agent_host_map_[agent_host->GetId()] = agent_host;
+  for (auto& agent_host : agent_hosts)
     list_value.Append(SerializeDescriptor(agent_host, host));
-  }
   SendJson(connection_id, net::HTTP_OK, &list_value, std::string());
 }
 
-scoped_refptr<DevToolsAgentHost> DevToolsHttpHandler::GetAgentHost(
-    const std::string& target_id) {
-  DescriptorMap::const_iterator it = agent_host_map_.find(target_id);
-  return it != agent_host_map_.end() ? it->second : nullptr;
-}
-
 void DevToolsHttpHandler::OnDiscoveryPageRequest(int connection_id) {
   std::string response = delegate_->GetDiscoveryPageHTML();
   Send200(connection_id, response, "text/html; charset=UTF-8");
 }
 
 void DevToolsHttpHandler::OnFrontendResourceRequest(
     int connection_id, const std::string& path) {
   Send200(connection_id,
           delegate_->GetFrontendResource(path),
           GetMimeType(path));
@@ skipping 20 matching lines @@
     return;
   }
 
   if (!base::StartsWith(request.path, kPageUrlPrefix,
                         base::CompareCase::SENSITIVE)) {
     Send404(connection_id);
     return;
   }
 
   std::string target_id = request.path.substr(strlen(kPageUrlPrefix));
-  scoped_refptr<DevToolsAgentHost> agent = GetAgentHost(target_id);
+  scoped_refptr<DevToolsAgentHost> agent =
+      DevToolsAgentHost::GetForId(target_id);
   if (!agent) {
     Send500(connection_id, "No such target id: " + target_id);
     return;
   }
 
   if (agent->IsAttached()) {
     Send500(connection_id,
             "Target with given id is being inspected: " + target_id);
     return;
   }
@@ skipping 172 matching lines @@
                                              id.c_str()));
     std::string devtools_frontend_url = GetFrontendURLInternal(id, host);
     dictionary->SetString(
         kTargetDevtoolsFrontendUrlField, devtools_frontend_url);
   }
 
   return dictionary;
 }
 
 }  // namespace content