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

chrome/browser/devtools/device/devtools_android_bridge.cc

Index: chrome/browser/devtools/device/devtools_android_bridge.cc
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc
index 7df783b6630f8b6dd371888d4551b0b33674f018..ab78ebfe3dca7ef47b58d6251f13848dddf7b8b8 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.cc
+++ b/chrome/browser/devtools/device/devtools_android_bridge.cc
@@ -300,6 +300,7 @@ class DevToolsAndroidBridge::AgentHostDelegate
       const std::string& target_path,
       const std::string& type,
       base::DictionaryValue* value);
+  ~AgentHostDelegate() override;
 
  private:
   AgentHostDelegate(
@@ -309,11 +310,9 @@ class DevToolsAndroidBridge::AgentHostDelegate
       const std::string& target_path,
       const std::string& type,
       base::DictionaryValue* value);
-  ~AgentHostDelegate() override;
   // DevToolsExternalAgentProxyDelegate overrides.
   void Attach(content::DevToolsExternalAgentProxy* proxy) override;
   void Detach() override;
-  std::string GetId() override;
   std::string GetType() override;
   std::string GetTitle() override;
   std::string GetDescription() override;
@@ -401,10 +400,10 @@ DevToolsAndroidBridge::AgentHostDelegate::GetOrCreateAgentHost(
   if (it != bridge->host_delegates_.end())
     return it->second->agent_host_;
 
-  AgentHostDelegate* delegate = new AgentHostDelegate(
-      bridge, browser_id, local_id, target_path, type, value);
+  std::unique_ptr<AgentHostDelegate> delegate(new AgentHostDelegate(
+      bridge, browser_id, local_id, target_path, type, value));
   scoped_refptr<content::DevToolsAgentHost> result =
-      content::DevToolsAgentHost::Create(delegate);
+      content::DevToolsAgentHost::Forward(local_id, std::move(delegate));
   delegate->agent_host_ = result.get();
   return result;
 }
@@ -464,10 +463,6 @@ void DevToolsAndroidBridge::AgentHostDelegate::Detach() {
   proxy_ = nullptr;
 }
 
-std::string DevToolsAndroidBridge::AgentHostDelegate::GetId() {
-  return local_id_;
-}
-
 std::string DevToolsAndroidBridge::AgentHostDelegate::GetType() {
   return remote_type_;
 }