DevTools: merge devtools target with devtools host, part 1

content/browser/devtools/browser_devtools_agent_host.cc

Index: content/browser/devtools/browser_devtools_agent_host.cc
diff --git a/content/browser/devtools/browser_devtools_agent_host.cc b/content/browser/devtools/browser_devtools_agent_host.cc
index 0e2835072f6f8a08d43d63997bdef5bb9498150f..668976a89e81ebb3bf595b286dc9b7ca19ac1dec 100644
--- a/content/browser/devtools/browser_devtools_agent_host.cc
+++ b/content/browser/devtools/browser_devtools_agent_host.cc
@@ -5,6 +5,7 @@
 #include "content/browser/devtools/browser_devtools_agent_host.h"
 
 #include "base/bind.h"
+#include "base/guid.h"
 #include "content/browser/devtools/devtools_protocol_handler.h"
 #include "content/browser/devtools/protocol/browser_handler.h"
 #include "content/browser/devtools/protocol/io_handler.h"
@@ -25,7 +26,8 @@ scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::CreateForBrowser(
 BrowserDevToolsAgentHost::BrowserDevToolsAgentHost(
     scoped_refptr<base::SingleThreadTaskRunner> tethering_task_runner,
     const CreateServerSocketCallback& socket_callback)
-    : browser_handler_(new devtools::browser::BrowserHandler()),
+    : DevToolsAgentHostImpl(base::GenerateGUID()),
+      browser_handler_(new devtools::browser::BrowserHandler()),
       io_handler_(new devtools::io::IOHandler(GetIOContext())),
       memory_handler_(new devtools::memory::MemoryHandler()),
       system_info_handler_(new devtools::system_info::SystemInfoHandler()),
@@ -55,8 +57,8 @@ void BrowserDevToolsAgentHost::Attach() {
 void BrowserDevToolsAgentHost::Detach() {
 }
 
-DevToolsAgentHost::Type BrowserDevToolsAgentHost::GetType() {
-  return TYPE_BROWSER;
+std::string BrowserDevToolsAgentHost::GetType() {
+  return kTypeBrowser;
 }
 
 std::string BrowserDevToolsAgentHost::GetTitle() {
@@ -71,10 +73,17 @@ bool BrowserDevToolsAgentHost::Activate() {
   return false;
 }
 
+bool BrowserDevToolsAgentHost::Inspect() {
+  return false;
+}
+
 bool BrowserDevToolsAgentHost::Close() {
   return false;
 }
 
+void BrowserDevToolsAgentHost::Reload() {
+}
+
 bool BrowserDevToolsAgentHost::DispatchProtocolMessage(
     const std::string& message) {
   protocol_handler_->HandleMessage(session_id(), message);