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

chrome/browser/devtools/device/devtools_android_bridge.cc

 // Copyright 2014 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 "chrome/browser/devtools/device/devtools_android_bridge.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <map>
 #include <set>
@@ skipping 282 matching lines @@
     : public content::DevToolsExternalAgentProxyDelegate,
       public AndroidDeviceManager::AndroidWebSocket::Delegate {
  public:
   static scoped_refptr<content::DevToolsAgentHost> GetOrCreateAgentHost(
       DevToolsAndroidBridge* bridge,
       const BrowserId& browser_id,
       const std::string& local_id,
       const std::string& target_path,
       const std::string& type,
       base::DictionaryValue* value);
+  ~AgentHostDelegate() override;
 
  private:
   AgentHostDelegate(
       DevToolsAndroidBridge* bridge,
       const BrowserId& browser_id,
       const std::string& local_id,
       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;
   GURL GetURL() override;
   GURL GetFaviconURL() override;
   bool Activate() override;
   bool Inspect() override;
   void Reload() override;
   bool Close() override;
   void SendMessageToBackend(const std::string& message) override;
@@ skipping 67 matching lines @@
     const BrowserId& browser_id,
     const std::string& local_id,
     const std::string& target_path,
     const std::string& type,
     base::DictionaryValue* value) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   AgentHostDelegates::iterator it = bridge->host_delegates_.find(local_id);
   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;
 }
 
 DevToolsAndroidBridge::AgentHostDelegate::AgentHostDelegate(
     DevToolsAndroidBridge* bridge,
     const BrowserId& browser_id,
     const std::string& local_id,
     const std::string& target_path,
     const std::string& type,
@@ skipping 39 matching lines @@
   web_socket_.reset(
       device_->CreateWebSocket(browser_id_.second, target_path_, this));
 }
 
 void DevToolsAndroidBridge::AgentHostDelegate::Detach() {
   web_socket_.reset();
   device_ = nullptr;
   proxy_ = nullptr;
 }
 
-std::string DevToolsAndroidBridge::AgentHostDelegate::GetId() {
-  return local_id_;
-}
-
 std::string DevToolsAndroidBridge::AgentHostDelegate::GetType() {
   return remote_type_;
 }
 
 std::string DevToolsAndroidBridge::AgentHostDelegate::GetTitle() {
   return title_;
 }
 
 std::string DevToolsAndroidBridge::AgentHostDelegate::GetDescription() {
   return description_;
@@ skipping 514 matching lines @@
     StopDeviceListPolling();
     StartDeviceListPolling();
   }
 }
 
 void DevToolsAndroidBridge::set_tcp_provider_callback_for_test(
     TCPProviderCallback callback) {
   tcp_provider_callback_ = callback;
   CreateDeviceProviders();
 }