DevTools: merge devtools target with devtools host, part 1

content/browser/devtools/devtools_agent_host_impl.cc

Index: content/browser/devtools/devtools_agent_host_impl.cc
diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc
index 109dccd0976b10575a2da8af4ef673ccac31e8f5..57d09a0f4da72c219fcf658d442cf852b97ed1a9 100644
--- a/content/browser/devtools/devtools_agent_host_impl.cc
+++ b/content/browser/devtools/devtools_agent_host_impl.cc
@@ -32,6 +32,14 @@ base::LazyInstance<AgentStateCallbacks>::Leaky g_callbacks =
     LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
+char DevToolsAgentHost::kTypePage[] = "page";
+char DevToolsAgentHost::kTypeFrame[] = "frame";
+char DevToolsAgentHost::kTypeSharedWorker[] = "shared_worker";
+char DevToolsAgentHost::kTypeServiceWorker[] = "service_worker";
+char DevToolsAgentHost::kTypeExternal[] = "external";
+char DevToolsAgentHost::kTypeBrowser[] = "browser";
+char DevToolsAgentHost::kTypeOther[] = "other";
+
 // static
 std::string DevToolsAgentHost::GetProtocolVersion() {
   return std::string(devtools::kProtocolVersion);
@@ -166,6 +174,22 @@ std::string DevToolsAgentHostImpl::GetId() {
   return id_;
 }
 
+std::string DevToolsAgentHostImpl::GetParentId() {
+  return "";
+}
+
+std::string DevToolsAgentHostImpl::GetDescription() {
+  return "";
+}
+
+GURL DevToolsAgentHostImpl::GetFaviconURL() {
+  return GURL();
+}
+
+base::TimeTicks DevToolsAgentHostImpl::GetLastActivityTime() {
+  return base::TimeTicks();
+}
+
 BrowserContext* DevToolsAgentHostImpl::GetBrowserContext() {
   return nullptr;
 }
@@ -180,6 +204,11 @@ void DevToolsAgentHostImpl::DisconnectWebContents() {
 void DevToolsAgentHostImpl::ConnectWebContents(WebContents* wc) {
 }
 
+void DevToolsAgentHostImpl::Inspect() {
+  DevToolsManager* manager = DevToolsManager::GetInstance();
+  manager->delegate()->Inspect(this);
+}
+
 void DevToolsAgentHostImpl::SendProtocolResponse(int session_id,
                                                  const std::string& message) {
   SendMessageToClient(session_id, message);
@@ -269,7 +298,7 @@ void DevToolsAgentHostImpl::NotifyCallbacks(
 bool DevToolsAgentHostImpl::Inspect(BrowserContext* browser_context) {

[dgozman, 2016/08/22 23:09:07]

Remove this method.

   DevToolsManager* manager = DevToolsManager::GetInstance();
   if (manager->delegate()) {
-    manager->delegate()->Inspect(browser_context, this);
+    manager->delegate()->Inspect(this);
     return true;
   }
   return false;