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

content/browser/devtools/devtools_manager_unittest.cc

 // Copyright (c) 2012 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 "content/browser/devtools/devtools_manager.h"
 
 #include <memory>
 
 #include "base/guid.h"
 #include "base/location.h"
@@ skipping 193 matching lines @@
   contents()->TestDidNavigate(contents()->GetMainFrame(), 1, pending_id, false,
                               url, ui::PAGE_TRANSITION_TYPED);
   EXPECT_FALSE(contents()->CrossProcessNavigationPending());
   EXPECT_EQ(client_host.agent_host(),
             DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
   client_host.Close();
 }
 
 class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
  public:
-  TestExternalAgentDelegate() : id_(base::GenerateGUID()) {
+  TestExternalAgentDelegate() {
   }
   ~TestExternalAgentDelegate() override {
     expectEvent(1, "Attach");
     expectEvent(1, "Detach");
     expectEvent(0, "SendMessageToBackend.message0");
     expectEvent(1, "SendMessageToBackend.message1");
     expectEvent(2, "SendMessageToBackend.message2");
   }
 
  private:
-  std::string id_;
   std::map<std::string,int> event_counter_;
 
   void recordEvent(const std::string& name) {
     if (event_counter_.find(name) == event_counter_.end())
       event_counter_[name] = 0;
     event_counter_[name] = event_counter_[name] + 1;
   }
 
   void expectEvent(int count, const std::string& name) {
     EXPECT_EQ(count, event_counter_[name]);
   }
 
   void Attach(DevToolsExternalAgentProxy* proxy) override {
     recordEvent("Attach");
   };
 
   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 ""; }
   GURL GetURL() override { return GURL(); }
   GURL GetFaviconURL() override { return GURL(); }
 
   bool Activate() override { return false; };
   bool Inspect() override { return false; };
   void Reload() override { };
   bool Close() override { return false; };
 
   void SendMessageToBackend(const std::string& message) override {
     recordEvent(std::string("SendMessageToBackend.") + message);
   };
 
 };
 
 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;
   client_host.InspectAgentHost(agent_host.get());
   agent_host->DispatchProtocolMessage(&client_host, "message1");
   agent_host->DispatchProtocolMessage(&client_host, "message2");
   agent_host->DispatchProtocolMessage(&client_host, "message2");
 
   client_host.Close();
 }
 
 }  // namespace content