Remove CHECKs from WebContentsImpl::OnDocumentLoadedInFrame

content/browser/web_contents/web_contents_impl.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/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 2745 matching lines @@
   RecordAction(base::UserMetricsAction("SSL.RanInsecureContent"));
   if (EndsWith(security_origin, kDotGoogleDotCom, false))
     RecordAction(base::UserMetricsAction("SSL.RanInsecureContentGoogle"));
   controller_.ssl_manager()->DidRunInsecureContent(security_origin);
   displayed_insecure_content_ = true;
   SSLManager::NotifySSLInternalStateChanged(
       GetController().GetBrowserContext());
 }
 
 void WebContentsImpl::OnDocumentLoadedInFrame() {
-  CHECK(render_frame_message_source_);
-  CHECK(!render_view_message_source_);
+  if (!render_frame_message_source_) {
+    RecordAction(base::UserMetricsAction("BadMessageTerminate_RVD2"));

[Charlie Reis, 2015/01/27 00:18:03]

Why RVD2?  I thought we usually abbreviated the class name that was triggering
this.  (I'm wondering if we should fix the case below as well or just leave
it...)

[nasko, 2015/01/27 01:29:37]

Fixed both. I forgot it on the first iteration.

+    // TODO(nasko): With --site-per-process, subframes can be in a different
+    // process from the main frame and this will kill the wrong process.
+    // Once RenderViewHost is not used to route messages, this should not
+    // happen.

[Charlie Reis, 2015/01/27 00:18:03]

I don't think this TODO is necessary.  "!render_frame_message_source_" implies
that render_view_message_source_ is valid (due to the DCHECK at the start of
OnMessageReceived), so the message would have come from the RVH.  That implies
that GetRenderProcessHost is the right thing to kill.

We can probably just drop the comment.

[nasko, 2015/01/27 01:29:36]

Done.

+    GetRenderProcessHost()->ReceivedBadMessage();
+    return;
+  }
+
   RenderFrameHostImpl* rfh =
       static_cast<RenderFrameHostImpl*>(render_frame_message_source_);
   FOR_EACH_OBSERVER(
       WebContentsObserver, observers_, DocumentLoadedInFrame(rfh));
 }
 
 void WebContentsImpl::OnDidFinishLoad(
     const GURL& url) {
   if (!render_frame_message_source_) {
     RecordAction(base::UserMetricsAction("BadMessageTerminate_RVD2"));
@@ skipping 1672 matching lines @@
   node->render_manager()->ResumeResponseDeferredAtStart();
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content