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

content/browser/devtools/render_view_devtools_agent_host.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/render_view_devtools_agent_host.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/devtools_manager_impl.h"
@@ skipping 109 matching lines @@
   tracing_handler_->SetNotifier(notifier);
   power_handler_->SetNotifier(notifier);
   g_instances.Get().push_back(this);
   AddRef();  // Balanced in RenderViewHostDestroyed.
 }
 
 WebContents* RenderViewDevToolsAgentHost::GetWebContents() {
   return web_contents();
 }
 
-void RenderViewDevToolsAgentHost::DispatchProtocolMessage(
+void RenderViewDevToolsAgentHost::DispatchOnInspectorBackend(
     const std::string& message) {
   std::string error_message;
 
   scoped_ptr<base::DictionaryValue> message_dict(
       DevToolsProtocol::ParseMessage(message, &error_message));
   scoped_refptr<DevToolsProtocol::Command> command =
       DevToolsProtocol::ParseCommand(message_dict.get(), &error_message);
 
   if (command) {
     scoped_refptr<DevToolsProtocol::Response> overridden_response;
@@ skipping 13 matching lines @@
       overridden_response = tracing_handler_->HandleCommand(command);
     if (!overridden_response)
       overridden_response = power_handler_->HandleCommand(command);
     if (overridden_response) {
       if (!overridden_response->is_async_promise())
         OnDispatchOnInspectorFrontend(overridden_response->Serialize());
       return;
     }
   }
 
-  IPCDevToolsAgentHost::DispatchProtocolMessage(message);
+  IPCDevToolsAgentHost::DispatchOnInspectorBackend(message);
 }
 
 void RenderViewDevToolsAgentHost::SendMessageToAgent(IPC::Message* msg) {
   if (!render_view_host_)
     return;
   msg->set_routing_id(render_view_host_->GetRoutingID());
   render_view_host_->Send(msg);
 }
 
 void RenderViewDevToolsAgentHost::OnClientAttached() {
   if (!render_view_host_)
     return;
 
   InnerOnClientAttached();
 
   // TODO(kaznacheev): Move this call back to DevToolsManagerImpl when
   // extensions::ProcessManager no longer relies on this notification.
   if (!reattaching_)
-    DevToolsAgentHostImpl::NotifyCallbacks(this, true);
+    DevToolsManagerImpl::GetInstance()->NotifyObservers(this, true);
 }
 
 void RenderViewDevToolsAgentHost::InnerOnClientAttached() {
   ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadRawCookies(
       render_view_host_->GetProcess()->GetID());
 
 #if defined(OS_ANDROID)
   power_save_blocker_.reset(
       static_cast<PowerSaveBlockerImpl*>(
           PowerSaveBlocker::Create(
@@ skipping 11 matching lines @@
   power_save_blocker_.reset();
 #endif
   overrides_handler_->OnClientDetached();
   tracing_handler_->OnClientDetached();
   power_handler_->OnClientDetached();
   ClientDetachedFromRenderer();
 
   // TODO(kaznacheev): Move this call back to DevToolsManagerImpl when
   // extensions::ProcessManager no longer relies on this notification.
   if (!reattaching_)
-    DevToolsAgentHostImpl::NotifyCallbacks(this, false);
+    DevToolsManagerImpl::GetInstance()->NotifyObservers(this, false);
 }
 
 void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() {
   if (!render_view_host_)
     return;
 
   InnerClientDetachedFromRenderer();
 }
 
 void RenderViewDevToolsAgentHost::InnerClientDetachedFromRenderer() {
@@ skipping 53 matching lines @@
   ConnectRenderViewHost(rvh);
   reattaching_ = false;
 }
 
 void RenderViewDevToolsAgentHost::RenderViewDeleted(RenderViewHost* rvh) {
   if (rvh != render_view_host_)
     return;
 
   DCHECK(render_view_host_);
   scoped_refptr<RenderViewDevToolsAgentHost> protect(this);
-  HostClosed();
+  NotifyCloseListener();
   ClearRenderViewHost();
   Release();
 }
 
 void RenderViewDevToolsAgentHost::RenderProcessGone(
     base::TerminationStatus status) {
   switch(status) {
     case base::TERMINATION_STATUS_ABNORMAL_TERMINATION:
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
     case base::TERMINATION_STATUS_PROCESS_CRASHED:
@@ skipping 78 matching lines @@
 
 void RenderViewDevToolsAgentHost::DisconnectRenderViewHost() {
   ClientDetachedFromRenderer();
   ClearRenderViewHost();
 }
 
 void RenderViewDevToolsAgentHost::RenderViewCrashed() {
   scoped_refptr<DevToolsProtocol::Notification> notification =
       DevToolsProtocol::CreateNotification(
           devtools::Inspector::targetCrashed::kName, NULL);
-  SendMessageToClient(notification->Serialize());
+  DevToolsManagerImpl::GetInstance()->
+      DispatchOnInspectorFrontend(this, notification->Serialize());
 }
 
 bool RenderViewDevToolsAgentHost::DispatchIPCMessage(
     const IPC::Message& msg) {
   if (!render_view_host_)
     return false;
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderViewDevToolsAgentHost, msg)
     IPC_MESSAGE_HANDLER(DevToolsClientMsg_DispatchOnInspectorFrontend,
@@ skipping 40 matching lines @@
     const std::string& message) {
   if (!render_view_host_)
     return;
 
   scoped_refptr<DevToolsProtocol::Notification> notification =
       DevToolsProtocol::ParseNotification(message);
 
   if (notification) {
     tracing_handler_->HandleNotification(notification);
   }
-  SendMessageToClient(message);
+  DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(
+      this, message);
 }
 
 }  // namespace content