Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index ff003ddb3c808f2ecd7ce45abb86207620d9d2bd..eb9eb5c134efae0e2287c3d92e6d259d42def844 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -2763,18 +2763,21 @@ void WebContentsImpl::OnDidRunInsecureContent( |
} |
void WebContentsImpl::OnDocumentLoadedInFrame() { |
- CHECK(render_frame_message_source_); |
- CHECK(!render_view_message_source_); |
+ if (!render_frame_message_source_) { |
+ RecordAction(base::UserMetricsAction("BadMessageTerminate_WC")); |
+ 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) { |
+void WebContentsImpl::OnDidFinishLoad(const GURL& url) { |
if (!render_frame_message_source_) { |
- RecordAction(base::UserMetricsAction("BadMessageTerminate_RVD2")); |
+ RecordAction(base::UserMetricsAction("BadMessageTerminate_WC")); |
GetRenderProcessHost()->ReceivedBadMessage(); |
return; |
} |