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

chrome/browser/android/devtools_manager_delegate_android.cc

 // Copyright 2015 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/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"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/devtools/devtools_network_protocol_handler.h"
 #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;
 
 namespace {
 
 class TabProxyDelegate : public content::DevToolsExternalAgentProxyDelegate,
                          public content::DevToolsAgentHostClient {
  public:
   explicit TabProxyDelegate(TabAndroid* tab)
@@ skipping 22 matching lines @@
     MaterializeAgentHost();
   }
 
   void Detach() override {
     if (agent_host_)
       agent_host_->DetachClient(this);
     agent_host_ = nullptr;
     proxy_ = nullptr;
   }
 
-  std::string GetId() override {
-    return base::IntToString(tab_id_);
-  }
-
   std::string GetType() override {
     return agent_host_ ? agent_host_->GetType() : DevToolsAgentHost::kTypePage;
   }
 
   std::string GetTitle() override {
     return agent_host_ ? agent_host_->GetTitle() : title_;
   }
 
   std::string GetDescription() override {
     return agent_host_ ? agent_host_->GetDescription() : "";
@@ skipping 88 matching lines @@
   std::set<WebContents*> tab_web_contents;
   for (TabModelList::const_iterator iter = TabModelList::begin();
       iter != TabModelList::end(); ++iter) {
     TabModel* model = *iter;
     for (int i = 0; i < model->GetTabCount(); ++i) {
       TabAndroid* tab = model->GetTabAt(i);
       if (!tab)
         continue;
 
       scoped_refptr<DevToolsAgentHost> host =
-          DevToolsAgentHost::Create(new TabProxyDelegate(tab));
+          DevToolsAgentHost::Forward(
+              base::IntToString(tab->GetAndroidId()),
+              base::WrapUnique(new TabProxyDelegate(tab)));
     }
   }
 
   // Add descriptors for targets not associated with any tabs.
   DevToolsAgentHost::List agents = DevToolsAgentHost::GetOrCreateAll();
   for (DevToolsAgentHost::List::iterator it = agents.begin();
        it != agents.end(); ++it) {
     if (WebContents* web_contents = (*it)->GetWebContents()) {
       if (tab_web_contents.find(web_contents) != tab_web_contents.end())
         continue;
@@ skipping 54 matching lines @@
     return nullptr;
 
   WebContents* web_contents = tab_model->CreateNewTabForDevTools(url);
   if (!web_contents)
     return nullptr;
 
   TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
   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(
     DevToolsAgentHost* agent_host, bool attached) {
   network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached);
 }