[DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage…

content/shell/browser/shell_devtools_frontend.cc

 // Copyright 2013 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/shell/browser/shell_devtools_frontend.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/devtools_http_handler.h"
-#include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/browser/shell_browser_main_parts.h"
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "content/shell/browser/shell_devtools_delegate.h"
 #include "content/shell/browser/webkit_test_controller.h"
@@ skipping 85 matching lines @@
       agent_host_(agent_host) {
 }
 
 ShellDevToolsFrontend::~ShellDevToolsFrontend() {
 }
 
 void ShellDevToolsFrontend::RenderViewCreated(
     RenderViewHost* render_view_host) {
   if (!frontend_host_) {
     frontend_host_.reset(DevToolsFrontendHost::Create(render_view_host, this));
-    DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
-        agent_host_.get(), this);
+    agent_host_->AttachClient(this);
   }
 }
 
 void ShellDevToolsFrontend::DocumentOnLoadCompletedInMainFrame() {
   web_contents()->GetMainFrame()->ExecuteJavaScript(
       base::ASCIIToUTF16("InspectorFrontendAPI.setUseSoftMenu(true);"));
 }
 
 void ShellDevToolsFrontend::WebContentsDestroyed() {
-  DevToolsManager::GetInstance()->ClientHostClosing(this);
+  agent_host_->DetachClient();
   delete this;
 }
 
 void ShellDevToolsFrontend::RenderProcessGone(base::TerminationStatus status) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
     WebKitTestController::Get()->DevToolsProcessCrashed();
 }
 
 void ShellDevToolsFrontend::HandleMessageFromDevToolsFrontend(
     const std::string& message) {
@@ skipping 11 matching lines @@
     return;
   }
 
   if (method != "sendMessageToBrowser" ||
       params->GetSize() != 1 ||
       !params->GetString(0, &browser_message)) {
     return;
   }
   dict->GetInteger("id", &id);
 
-  DevToolsManager::GetInstance()->DispatchOnInspectorBackend(
-      this, browser_message);
+  agent_host_->DispatchOnInspectorBackend(browser_message);
 
   if (id) {
     std::string code = "InspectorFrontendAPI.embedderMessageAck(" +
         base::IntToString(id) + ",\"\");";
     base::string16 javascript = base::UTF8ToUTF16(code);
     web_contents()->GetMainFrame()->ExecuteJavaScript(javascript);
   }
 }
 
 void ShellDevToolsFrontend::HandleMessageFromDevToolsFrontendToBackend(
     const std::string& message) {
-  DevToolsManager::GetInstance()->DispatchOnInspectorBackend(
-      this, message);
+  agent_host_->DispatchOnInspectorBackend(message);
 }
 
-void ShellDevToolsFrontend::DispatchOnInspectorFrontend(
-    const std::string& message) {
+void ShellDevToolsFrontend::SendMessageFromAgentHost(
+    DevToolsAgentHost* agent_host, const std::string& message) {
   std::string code = "InspectorFrontendAPI.dispatchMessage(" + message + ");";
   base::string16 javascript = base::UTF8ToUTF16(code);
   web_contents()->GetMainFrame()->ExecuteJavaScript(javascript);
 }
 
-void ShellDevToolsFrontend::InspectedContentsClosing() {
-  frontend_shell_->Close();
+void ShellDevToolsFrontend::AgentHostDetached(
+    DevToolsAgentHost* agent_host, DevToolsAgentHost::DetachReason reason) {
+  DCHECK(agent_host == agent_host_.get());
+  if (reason != DevToolsAgentHost::DETACHED_BY_CLIENT)
+    frontend_shell_->Close();
 }
 
 }  // namespace content