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

content/browser/devtools/devtools_manager_unittest.cc

Index: content/browser/devtools/devtools_manager_unittest.cc
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index 70b3fa5f7f9164ee77379270dba16cf469a12178..b56f17e352f49a8ad205db1bb0308646e217a2e6 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -211,7 +211,7 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
 
 class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
  public:
-  TestExternalAgentDelegate() : id_(base::GenerateGUID()) {
+  TestExternalAgentDelegate() {
   }
   ~TestExternalAgentDelegate() override {
     expectEvent(1, "Attach");
@@ -222,7 +222,6 @@ class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
   }
 
  private:
-  std::string id_;
   std::map<std::string,int> event_counter_;
 
   void recordEvent(const std::string& name) {
@@ -241,7 +240,6 @@ class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
 
   void Detach() override { recordEvent("Detach"); };
 
-  std::string GetId() override { return id_; }
   std::string GetType() override { return ""; }
   std::string GetTitle() override { return ""; }
   std::string GetDescription() override { return ""; }
@@ -260,10 +258,11 @@ class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
 };
 
 TEST_F(DevToolsManagerTest, TestExternalProxy) {
-  TestExternalAgentDelegate* delegate = new TestExternalAgentDelegate();
+  std::unique_ptr<TestExternalAgentDelegate> delegate(
+      new TestExternalAgentDelegate());
 
   scoped_refptr<DevToolsAgentHost> agent_host =
-      DevToolsAgentHost::Create(delegate);
+      DevToolsAgentHost::Forward(base::GenerateGUID(), std::move(delegate));
   EXPECT_EQ(agent_host, DevToolsAgentHost::GetForId(agent_host->GetId()));
 
   TestDevToolsClientHost client_host;