[DevTools] Migrate dom, emulation, inspector, network, page and schema handlers to new generator.

content/browser/devtools/render_frame_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_frame_devtools_agent_host.h"
 
 #include <tuple>
 #include <utility>
 
 #include "base/guid.h"
@@ skipping 360 matching lines @@
     return agent_host->page_handler_->CreateThrottleForNavigation(
         navigation_handle);
   }
   return nullptr;
 }
 
 // static
 bool RenderFrameDevToolsAgentHost::IsNetworkHandlerEnabled(
     FrameTreeNode* frame_tree_node) {
   RenderFrameDevToolsAgentHost* agent_host = FindAgentHost(frame_tree_node);
-  if (!agent_host)
-    return false;
-  return agent_host->network_handler_->enabled();
+  return !!agent_host && agent_host->network_handler_ &&

[caseq, 2016/12/06 18:42:13]

nit: nuke !!

[dgozman, 2016/12/07 00:22:13]

Done.

+         agent_host->network_handler_->enabled();
 }
 
 // static
 void RenderFrameDevToolsAgentHost::WebContentsCreated(
     WebContents* web_contents) {
   if (ShouldForceCreation()) {
     // Force agent host.
     DevToolsAgentHost::GetOrCreateFor(web_contents);
   }
 }
 
 RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
     RenderFrameHostImpl* host)
     : DevToolsAgentHostImpl(base::GenerateGUID()),
       dom_handler_(new devtools::dom::DOMHandler()),
       input_handler_(new devtools::input::InputHandler()),
-      inspector_handler_(new devtools::inspector::InspectorHandler()),
-      network_handler_(new devtools::network::NetworkHandler()),
       page_handler_(nullptr),
-      schema_handler_(new devtools::schema::SchemaHandler()),
       security_handler_(nullptr),
       service_worker_handler_(
           new devtools::service_worker::ServiceWorkerHandler()),
       storage_handler_(new devtools::storage::StorageHandler()),
       target_handler_(new devtools::target::TargetHandler()),
       emulation_handler_(nullptr),
       frame_trace_recorder_(nullptr),
       protocol_handler_(new DevToolsProtocolHandler(this)),
       handlers_frame_host_(nullptr),
       current_frame_crashed_(false),
       pending_handle_(nullptr),
       frame_tree_node_(host->frame_tree_node()) {
   DevToolsProtocolDispatcher* dispatcher = protocol_handler_->dispatcher();
   dispatcher->SetDOMHandler(dom_handler_.get());
   dispatcher->SetInputHandler(input_handler_.get());
-  dispatcher->SetInspectorHandler(inspector_handler_.get());
-  dispatcher->SetNetworkHandler(network_handler_.get());
-  dispatcher->SetSchemaHandler(schema_handler_.get());
   dispatcher->SetServiceWorkerHandler(service_worker_handler_.get());
   dispatcher->SetStorageHandler(storage_handler_.get());
   dispatcher->SetTargetHandler(target_handler_.get());
 
   if (!host->GetParent()) {
     security_handler_.reset(new devtools::security::SecurityHandler());
     page_handler_.reset(new devtools::page::PageHandler());
     emulation_handler_.reset(
         new devtools::emulation::EmulationHandler());
     dispatcher->SetSecurityHandler(security_handler_.get());
@@ skipping 58 matching lines @@
   return contents ? contents->GetBrowserContext() : nullptr;
 }
 
 WebContents* RenderFrameDevToolsAgentHost::GetWebContents() {
   return web_contents();
 }
 
 void RenderFrameDevToolsAgentHost::Attach() {
   session()->dispatcher()->setFallThroughForNotFound(true);
 
+  inspector_handler_.reset(new protocol::InspectorHandler());
+  inspector_handler_->Wire(session()->dispatcher());

[caseq, 2016/12/06 18:42:13]

Symmetrically to detaching automatically in destructor, let's move wiring into
the constructor -- it looks like a handler never exists in a detached state
practically, so why not get this explicit.

[dgozman, 2016/12/07 00:22:13]

Good point. I'll follow up with a refactoring after migration of all domains.

+  inspector_handler_->SetRenderFrameHost(handlers_frame_host_);
+
   io_handler_.reset(new protocol::IOHandler(GetIOContext()));
   io_handler_->Wire(session()->dispatcher());
 
+  network_handler_.reset(new protocol::NetworkHandler());
+  network_handler_->Wire(session()->dispatcher());
+  network_handler_->SetRenderFrameHost(handlers_frame_host_);
+
+  schema_handler_.reset(new protocol::SchemaHandler());
+  schema_handler_->Wire(session()->dispatcher());
+
   tracing_handler_.reset(new protocol::TracingHandler(
       protocol::TracingHandler::Renderer,
       frame_tree_node_->frame_tree_node_id(),
       GetIOContext()));
   tracing_handler_->Wire(session()->dispatcher());
 
   if (current_)
     current_->Attach();
   if (pending_)
     pending_->Attach();
   OnClientAttached();
 }
 
 void RenderFrameDevToolsAgentHost::Detach() {
+  inspector_handler_->Disable();
+  inspector_handler_.reset();
   io_handler_->Disable();
   io_handler_.reset();
+  network_handler_->Disable();
+  network_handler_.reset();
+  schema_handler_->Disable();
+  schema_handler_.reset();
   tracing_handler_->Disable();
   tracing_handler_.reset();
 
   if (current_)
     current_->Detach();
   if (pending_)
     pending_->Detach();
   OnClientDetached();
 }
 
@@ skipping 261 matching lines @@
     case base::TERMINATION_STATUS_ABNORMAL_TERMINATION:
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
 #if defined(OS_CHROMEOS)
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM:
 #endif
     case base::TERMINATION_STATUS_PROCESS_CRASHED:
 #if defined(OS_ANDROID)
     case base::TERMINATION_STATUS_OOM_PROTECTED:
 #endif
     case base::TERMINATION_STATUS_LAUNCH_FAILED:
-      inspector_handler_->TargetCrashed();
+      if (inspector_handler_)
+        inspector_handler_->TargetCrashed();
       current_frame_crashed_ = true;
       break;
     default:
-      inspector_handler_->TargetDetached("Render process gone.");
+      if (inspector_handler_)
+        inspector_handler_->TargetDetached("Render process gone.");
       break;
   }
   DCHECK(CheckConsistency());
 }
 
 bool RenderFrameDevToolsAgentHost::OnMessageReceived(
     const IPC::Message& message) {
   if (!current_)
     return false;
   if (message.type() == ViewHostMsg_SwapCompositorFrame::ID)
@@ skipping 96 matching lines @@
 }
 
 void RenderFrameDevToolsAgentHost::UpdateProtocolHandlers(
     RenderFrameHostImpl* host) {
   handlers_frame_host_ = host;
   dom_handler_->SetRenderFrameHost(host);
   if (emulation_handler_)
     emulation_handler_->SetRenderFrameHost(host);
   input_handler_->SetRenderWidgetHost(
       host ? host->GetRenderWidgetHost() : nullptr);
-  inspector_handler_->SetRenderFrameHost(host);
-  network_handler_->SetRenderFrameHost(host);
+  if (inspector_handler_)
+    inspector_handler_->SetRenderFrameHost(host);
+  if (network_handler_)
+    network_handler_->SetRenderFrameHost(host);
   if (page_handler_)
     page_handler_->SetRenderFrameHost(host);
   service_worker_handler_->SetRenderFrameHost(host);
   if (security_handler_)
     security_handler_->SetRenderFrameHost(host);
   if (storage_handler_)
     storage_handler_->SetRenderFrameHost(host);
   target_handler_->SetRenderFrameHost(host);
 }
 
@@ skipping 207 matching lines @@
     RenderFrameHost* host) {
   return (current_ && current_->host() == host) ||
       (pending_ && pending_->host() == host);
 }
 
 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
   return current_ && current_->host()->GetParent();
 }
 
 }  // namespace content