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

chrome/browser/android/devtools_manager_delegate_android.cc

Index: chrome/browser/android/devtools_manager_delegate_android.cc
diff --git a/chrome/browser/android/devtools_manager_delegate_android.cc b/chrome/browser/android/devtools_manager_delegate_android.cc
index 051817fc56e30564ab166c0d244443533d929d22..a9e57a92390edcc2339f669355b25fc324e8232c 100644
--- a/chrome/browser/android/devtools_manager_delegate_android.cc
+++ b/chrome/browser/android/devtools_manager_delegate_android.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/android/devtools_manager_delegate_android.h"
 
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ -13,11 +14,13 @@
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "chrome/common/features.h"
+#include "chrome/grit/browser_resources.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_agent_host_client.h"
 #include "content/public/browser/devtools_external_agent_proxy.h"
 #include "content/public/browser/devtools_external_agent_proxy_delegate.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/base/resource/resource_bundle.h"
 
 using content::DevToolsAgentHost;
 using content::WebContents;
@@ -60,10 +63,6 @@ class TabProxyDelegate : public content::DevToolsExternalAgentProxyDelegate,
     proxy_ = nullptr;
   }
 
-  std::string GetId() override {
-    return base::IntToString(tab_id_);
-  }
-
   std::string GetType() override {
     return agent_host_ ? agent_host_->GetType() : DevToolsAgentHost::kTypePage;
   }
@@ -172,7 +171,9 @@ DevToolsAgentHost::List GetDescriptors() {
         continue;
 
       scoped_refptr<DevToolsAgentHost> host =
-          DevToolsAgentHost::Create(new TabProxyDelegate(tab));
+          DevToolsAgentHost::Forward(
+              base::IntToString(tab->GetAndroidId()),
+              base::WrapUnique(new TabProxyDelegate(tab)));
     }
   }
 
@@ -247,7 +248,14 @@ DevToolsManagerDelegateAndroid::CreateNewTarget(const GURL& url) {
   if (!tab)
     return nullptr;
 
-  return DevToolsAgentHost::Create(new TabProxyDelegate(tab));
+  return DevToolsAgentHost::Forward(
+      base::IntToString(tab->GetAndroidId()),
+      base::WrapUnique(new TabProxyDelegate(tab)));
+}
+
+std::string DevToolsManagerDelegateAndroid::GetDiscoveryPageHTML() {
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+      IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
 }
 
 void DevToolsManagerDelegateAndroid::DevToolsAgentStateChanged(