Revert of [DevTools] Migrate security handler 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 377 matching lines @@
   if (ShouldForceCreation()) {
     // Force agent host.
     DevToolsAgentHost::GetOrCreateFor(web_contents);
   }
 }
 
 RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
     RenderFrameHostImpl* host)
     : DevToolsAgentHostImpl(base::GenerateGUID()),
       input_handler_(new devtools::input::InputHandler()),
+      security_handler_(nullptr),
       service_worker_handler_(
           new devtools::service_worker::ServiceWorkerHandler()),
       storage_handler_(new devtools::storage::StorageHandler()),
       target_handler_(new devtools::target::TargetHandler()),
       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->SetInputHandler(input_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());
+    dispatcher->SetSecurityHandler(security_handler_.get());
+  }
+
   SetPending(host);
   CommitPending();
   WebContentsObserver::Observe(WebContents::FromRenderFrameHost(host));
 
   if (web_contents() && web_contents()->GetCrashedStatus() !=
       base::TERMINATION_STATUS_STILL_RUNNING) {
       current_frame_crashed_ = true;
   }
 
   g_instances.Get().push_back(this);
@@ skipping 74 matching lines @@
 
   if (!frame_tree_node_->parent()) {
     page_handler_.reset(new protocol::PageHandler());
     page_handler_->Wire(session()->dispatcher());
     page_handler_->SetRenderFrameHost(handlers_frame_host_);
   }
 
   schema_handler_.reset(new protocol::SchemaHandler());
   schema_handler_->Wire(session()->dispatcher());
 
-  if (!frame_tree_node_->parent()) {
-    security_handler_.reset(new protocol::SecurityHandler());
-    security_handler_->Wire(session()->dispatcher());
-    security_handler_->SetRenderFrameHost(handlers_frame_host_);
-  }
-
   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();
@@ skipping 12 matching lines @@
   io_handler_->Disable();
   io_handler_.reset();
   network_handler_->Disable();
   network_handler_.reset();
   if (page_handler_) {
     page_handler_->Disable();
     page_handler_.reset();
   }
   schema_handler_->Disable();
   schema_handler_.reset();
-  if (security_handler_) {
-    security_handler_->Disable();
-    security_handler_.reset();
-  }
   tracing_handler_->Disable();
   tracing_handler_.reset();
 
   if (current_)
     current_->Detach();
   if (pending_)
     pending_->Detach();
   OnClientDetached();
 }
 
@@ skipping 619 matching lines @@
     RenderFrameHost* host) {
   return (current_ && current_->host() == host) ||
       (pending_ && pending_->host() == host);
 }
 
 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
   return current_ && current_->host()->GetParent();
 }
 
 }  // namespace content