DevTools: merge devtools_http_handler into content - it is used in all the embedders anyways.

content/browser/devtools/devtools_agent_host_impl.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/browser/devtools/devtools_agent_host_impl.h"
 
 #include <map>
 #include <vector>
 
 #include "base/json/json_writer.h"
@@ skipping 26 matching lines @@
 
 char DevToolsAgentHost::kTypePage[] = "page";
 char DevToolsAgentHost::kTypeFrame[] = "iframe";
 char DevToolsAgentHost::kTypeSharedWorker[] = "shared_worker";
 char DevToolsAgentHost::kTypeServiceWorker[] = "service_worker";
 char DevToolsAgentHost::kTypeExternal[] = "external";
 char DevToolsAgentHost::kTypeBrowser[] = "browser";
 char DevToolsAgentHost::kTypeOther[] = "other";
 
 // static
-DevToolsManagerDelegate* DevToolsAgentHost::GetDevToolsManagerDelegate() {
-  DevToolsManager* manager = DevToolsManager::GetInstance();
-  return manager->delegate();
-}
-
-// static
 std::string DevToolsAgentHost::GetProtocolVersion() {
   return std::string(devtools::kProtocolVersion);
 }
 
 // static
 bool DevToolsAgentHost::IsSupportedProtocolVersion(const std::string& version) {
   return devtools::IsSupportedProtocolVersion(version);
 }
 
 // static
@@ skipping 44 matching lines @@
                                           worker_route_id)) {
     return host;
   }
   return ServiceWorkerDevToolsManager::GetInstance()
       ->GetDevToolsAgentHostForWorker(worker_process_id, worker_route_id);
 }
 
 DevToolsAgentHostImpl::DevToolsAgentHostImpl(const std::string& id)
     : id_(id),
       session_id_(0),
-      description_(""),
       client_(NULL) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(g_instances.Get().find(id_) == g_instances.Get().end());
   g_instances.Get()[id_] = this;
 }
 
 DevToolsAgentHostImpl::~DevToolsAgentHostImpl() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   g_instances.Get().erase(g_instances.Get().find(id_));
 }
 
 // static
 scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::GetForId(
     const std::string& id) {
   if (g_instances == NULL)
     return NULL;
   Instances::iterator it = g_instances.Get().find(id);
   if (it == g_instances.Get().end())
     return NULL;
   return it->second;
 }
 
 // static
-scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::Create(
-    DevToolsExternalAgentProxyDelegate* delegate) {
-  return new ForwardingAgentHost(delegate);
+scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::Forward(
+    const std::string& id,
+    std::unique_ptr<DevToolsExternalAgentProxyDelegate> delegate) {
+  scoped_refptr<DevToolsAgentHost> result = DevToolsAgentHost::GetForId(id);
+  if (result)
+    return result;
+  return new ForwardingAgentHost(id, std::move(delegate));
 }
 
 bool DevToolsAgentHostImpl::InnerAttach(DevToolsAgentHostClient* client,
                                         bool force) {
   if (client_ && !force)
     return false;
 
   scoped_refptr<DevToolsAgentHostImpl> protect(this);
   ++session_id_;
   if (client_) {
@@ skipping 51 matching lines @@
 
 std::string DevToolsAgentHostImpl::GetId() {
   return id_;
 }
 
 std::string DevToolsAgentHostImpl::GetParentId() {
   return "";
 }
 
 std::string DevToolsAgentHostImpl::GetDescription() {
-  return description_;
-}
-
-void DevToolsAgentHostImpl::SetDescriptionOverride(
-    const std::string& description) {
-  description_ = description;
+  return "";
 }
 
 GURL DevToolsAgentHostImpl::GetFaviconURL() {
   return GURL();
 }
 
 base::TimeTicks DevToolsAgentHostImpl::GetLastActivityTime() {
   return base::TimeTicks();
 }
 
@@ skipping 146 matching lines @@
     if (message_buffer_.size() != message_buffer_size_)
       return false;
     callback_.Run(chunk.session_id, message_buffer_);
     message_buffer_ = std::string();
     message_buffer_size_ = 0;
   }
   return true;
 }
 
 }  // namespace content