Ensure RenderFrameHost & NavigationHandle are not destroyed during commit

content/browser/frame_host/navigator_impl.cc

 // Copyright 2013 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/frame_host/navigator_impl.h"
 
 #include <utility>
 
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
@@ skipping 584 matching lines @@
             ui::PAGE_TRANSITION_FORWARD_BACK)) {
       transition_type = ui::PageTransitionFromInt(
           params.transition | ui::PAGE_TRANSITION_FORWARD_BACK);
     }
 
     delegate_->DidCommitProvisionalLoad(render_frame_host,
                                         params.url,
                                         transition_type);
     render_frame_host->navigation_handle()->DidCommitNavigation(
         params, is_navigation_within_page, render_frame_host);
+
+    // TODO(clamy): Remove this once enough data has been gathered for
+    // crbug.com/589365.
+    render_frame_host->navigation_handle()->set_is_in_commit(false);
+
     render_frame_host->SetNavigationHandle(nullptr);
   }
 
+  // TODO(clamy): The NavigationHandle should always be reset here.

[nasko, 2016/03/15 14:10:34]

Why not add a CHECK to verify this?

[clamy, 2016/03/15 14:16:16]

Because I know for a fact that this isn't the case and I plan to fix it, but not
in that patch.

+
   if (!did_navigate)
     return;  // No navigation happened.
 
   // DO NOT ADD MORE STUFF TO THIS FUNCTION! Your component should either listen
   // for the appropriate notification (best) or you can add it to
   // DidNavigateMainFramePostCommit / DidNavigateAnyFramePostCommit (only if
   // necessary, please).
 
   // TODO(carlosk): Move this out when PlzNavigate implementation properly calls
   // the observer methods.
@@ skipping 497 matching lines @@
       entry->set_should_replace_entry(pending_entry->should_replace_entry());
       entry->SetRedirectChain(pending_entry->GetRedirectChain());
     }
     controller_->SetPendingEntry(std::move(entry));
     if (delegate_)
       delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
   }
 }
 
 }  // namespace content