Revert of DevTools: Protocol handler generator for content

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 "base/strings/utf_string_conversions.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/devtools_manager.h"
 #include "content/browser/devtools/devtools_power_handler.h"
 #include "content/browser/devtools/devtools_protocol.h"
 #include "content/browser/devtools/devtools_protocol_constants.h"
 #include "content/browser/devtools/devtools_tracing_handler.h"
-#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
 #include "content/browser/devtools/renderer_overrides_handler.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/devtools_manager_delegate.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 76 matching lines @@
   WebContents* web_contents = WebContents::FromRenderViewHost(pending);
   RenderViewDevToolsAgentHost* agent_host = FindAgentHost(web_contents);
   if (!agent_host)
     return;
   agent_host->DisconnectRenderViewHost();
   agent_host->ConnectRenderViewHost(current);
 }
 
 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)
     : render_view_host_(NULL),
-      input_handler_(new devtools::input::InputHandler()),
-      page_handler_(new devtools::page::PageHandler()),
-      handler_impl_(new DevToolsProtocolHandlerImpl()),
       overrides_handler_(new RendererOverridesHandler()),
       tracing_handler_(
           new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)),
       power_handler_(new DevToolsPowerHandler()),
       reattaching_(false) {
-  handler_impl_->SetInputHandler(input_handler_.get());
-  handler_impl_->SetPageHandler(page_handler_.get());
   SetRenderViewHost(rvh);
   DevToolsProtocol::Notifier notifier(base::Bind(
       &RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend,
       base::Unretained(this)));
-  handler_impl_->SetNotifier(notifier);
   overrides_handler_->SetNotifier(notifier);
   tracing_handler_->SetNotifier(notifier);
   power_handler_->SetNotifier(notifier);
   g_instances.Get().push_back(this);
   AddRef();  // Balanced in RenderViewHostDestroyed.
 }
 
 WebContents* RenderViewDevToolsAgentHost::GetWebContents() {
   return web_contents();
 }
@@ skipping 18 matching lines @@
       if (overridden_response_value)
         overridden_response = DevToolsProtocol::ParseResponse(
             overridden_response_value.get());
     }
     if (!overridden_response.get())
       overridden_response = overrides_handler_->HandleCommand(command);
     if (!overridden_response.get())
       overridden_response = tracing_handler_->HandleCommand(command);
     if (!overridden_response.get())
       overridden_response = power_handler_->HandleCommand(command);
-    if (!overridden_response.get())
-      overridden_response = handler_impl_->HandleCommand(command);
     if (overridden_response.get()) {
       if (!overridden_response->is_async_promise())
         OnDispatchOnInspectorFrontend(overridden_response->Serialize());
       return;
     }
   }
 
   IPCDevToolsAgentHost::DispatchProtocolMessage(message);
 }
 
@@ skipping 178 matching lines @@
     overrides_handler_->OnVisibilityChanged(visible);
   }
 }
 
 void RenderViewDevToolsAgentHost::SetRenderViewHost(RenderViewHost* rvh) {
   DCHECK(!render_view_host_);
   render_view_host_ = static_cast<RenderViewHostImpl*>(rvh);
 
   WebContentsObserver::Observe(WebContents::FromRenderViewHost(rvh));
   overrides_handler_->SetRenderViewHost(render_view_host_);
-  input_handler_->SetRenderViewHost(render_view_host_);
-  page_handler_->SetRenderViewHost(render_view_host_);
 
   registrar_.Add(
       this,
       content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED,
       content::Source<RenderWidgetHost>(render_view_host_));
 }
 
 void RenderViewDevToolsAgentHost::ClearRenderViewHost() {
   DCHECK(render_view_host_);
   registrar_.Remove(
       this,
       content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED,
       content::Source<RenderWidgetHost>(render_view_host_));
   render_view_host_ = NULL;
   overrides_handler_->ClearRenderViewHost();
-  input_handler_->SetRenderViewHost(NULL);
-  page_handler_->SetRenderViewHost(NULL);
 }
 
 void RenderViewDevToolsAgentHost::DisconnectWebContents() {
   DisconnectRenderViewHost();
 }
 
 void RenderViewDevToolsAgentHost::ConnectWebContents(WebContents* wc) {
   ConnectRenderViewHost(wc->GetRenderViewHost());
 }
 
@@ skipping 89 matching lines @@
 }
 
 void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend(
     const std::string& message) {
   if (!render_view_host_)
     return;
   SendMessageToClient(message);
 }
 
 }  // namespace content