Band-aid fix for bug 487406

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 769bc4a9d52cc10c45ccf87c8e0ad1d0135fbed2..1b2d68ac53b4c097099cbbba775f7897cd7dffe2 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -937,6 +937,7 @@ bool RenderFrameHostManager::ClearProxiesInSiteInstance(
     // in the proxy) and it was still pending swap out, move the RFH to the
     // pending deletion list first.
     if (node->IsMainFrame() &&
+        proxy->render_frame_host() &&

[nasko, 2015/05/14 14:09:00]

Funny enough, I had this exact change in my CL to swap the main frame.

         proxy->render_frame_host()->rfh_state() ==
         RenderFrameHostImpl::STATE_PENDING_SWAP_OUT) {
       scoped_ptr<RenderFrameHostImpl> swapped_out_rfh =