Deal with frame removal by content scripts

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index bb2156a285c74eaaef452b2e81c7f5b534d43756..e55a44dc38c68298ef9fac12de80c41e7eecf482 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3378,6 +3378,10 @@ void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) {
                     DidCreateDocumentElement());
   FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
                     DidCreateDocumentElement(frame));
+
+  GetContentClient()->renderer()->AfterDidCreateDocumentElement(
+      weak_factory_.GetWeakPtr());
+  // Do not use |this| or |frame|! ContentClient may might deleted them by now!

[nasko, 2016/02/11 16:49:01]

nit: "may might deleted" doesn't sound right. Maybe "ContentClient may have
deleted this object."

[robwu, 2016/02/11 17:51:08]

Oops. I intended to write "might have". I'll fix it with the next patchset.

[robwu, 2016/02/11 23:36:50]

Done.

 }
 
 void RenderFrameImpl::didReceiveTitle(blink::WebLocalFrame* frame,
@@ -3421,6 +3425,11 @@ void RenderFrameImpl::didFinishDocumentLoad(blink::WebLocalFrame* frame,
                     DidFinishDocumentLoad(frame));
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidFinishDocumentLoad());
 
+  base::WeakPtr<RenderFrame> weak_self = weak_factory_.GetWeakPtr();
+  GetContentClient()->renderer()->AfterDidFinishDocumentLoad(weak_self);
+  if (!weak_self.get())
+    return;
+
   // Check whether we have new encoding name.
   UpdateEncoding(frame, frame->view()->pageEncoding().utf8());