From f68ff6ec8cafe214f3ca99e2df9ca20b83f421ba Mon Sep 17 00:00:00 2001 From: rmcilroy Date: Wed, 15 Oct 2014 03:27:16 -0700 Subject: [PATCH] Revert of RenderHostImpl::AddRoute - Turn a DCHECK to CHECK() (patchset #3 id:40001 of https://codereview.chromium.org/657613003/) Reason for revert: This broke the perf bots, details in crbug.com/423691 BUG=423691 Original issue's description: > RenderHostImpl::AddRoute - Turn a DCHECK to CHECK() > > This is to narrow down the cause of a crash bug and > likely to crash. Please revert and let me know > if you see this in the wild. > > R=nasko@chromium.org, kareng@chromium.org > BUG=381990, 415059 > > Committed: https://crrev.com/40e8a27bfd3c51ca92136c796d50e3f3a0d86c04 > Cr-Commit-Position: refs/heads/master@{#299591} TBR=kareng@chromium.org,nasko@chromium.org,morrita@chromium.org NOTREECHECKS=true NOTRY=true BUG=381990, 415059 Review URL: https://codereview.chromium.org/659763002 Cr-Commit-Position: refs/heads/master@{#299669} --- .../renderer_host/render_process_host_impl.cc | 27 ++-------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 5b78ad64e2e9..717877410e36 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -20,7 +20,6 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/debug/alias.h" #include "base/debug/trace_event.h" #include "base/files/file.h" #include "base/lazy_instance.h" @@ -919,33 +918,11 @@ ServiceRegistry* RenderProcessHostImpl::GetServiceRegistry() { return mojo_application_host_->service_registry(); } -namespace { -struct DebugInfoToCapture { - public: - DebugInfoToCapture(int32 rid, int pid) - : routing_id(rid), process_id(pid) { - signature[0] = 'I'; - signature[1] = 'N'; - signature[2] = 'F'; - signature[3] = 'O'; - } - - char signature[4]; - int32 routing_id; - int process_id; -}; -} - void RenderProcessHostImpl::AddRoute( int32 routing_id, IPC::Listener* listener) { - DebugInfoToCapture info(routing_id, GetID()); - base::debug::Alias(&info); - CHECK(widget_helper_->IsRoutingIDProbablyValid(routing_id)) - << "Found Invalid Routing ID: " << routing_id; - CHECK(!listeners_.Lookup(routing_id)) - << "Found Routing ID conflicts: " << routing_id - << " with Child PID: " << GetID(); + DCHECK(widget_helper_->IsRoutingIDProbablyValid(routing_id)) + << "Found Routing ID conflicts: " << routing_id; listeners_.AddWithID(listener, routing_id); } -- 2.11.4.GIT