Remove WebContentsObserver::DidCommitNavigation

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 53417fc3adacec03cb632be18610979ae65f0956..b77e7bed319160eddee8c62b6609f782c6211ec0 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -485,7 +485,9 @@ void NavigatorImpl::DidNavigate(
     delegate_->DidCommitProvisionalLoad(render_frame_host,
                                         params.url,
                                         transition_type);
-    render_frame_host->navigation_handle()->DidCommitNavigation();
+    render_frame_host->navigation_handle()->DidCommitNavigation(
+        render_frame_host);
+    render_frame_host->SetNavigationHandle(nullptr);
   }
 
   if (!did_navigate)
@@ -738,7 +740,6 @@ void NavigatorImpl::CommitNavigation(FrameTreeNode* frame_tree_node,
       render_frame_host, navigation_request->common_params().url);
 
   navigation_request->TransferNavigationHandleOwnership(render_frame_host);
-  delegate_->ReadyToCommitNavigation(render_frame_host->navigation_handle());

[nasko, 2015/09/18 16:42:16]

I think having this explicitly called before commit makes it more clear.
Otherwise we have to ensure that TransferNavigationHandleOwnership always
implies ready to commit and ideally enforce this.

[clamy, 2015/09/18 20:37:33]

Well that's what TransferNavigationHandleOwnership is meant to do: transfer the
NavigationHandle ownership to a RFH when the navigation is ready to commit (see
the description in navigation_handle.h). I can still move it out of the function
if you want.

   render_frame_host->CommitNavigation(response, body.Pass(),
                                       navigation_request->common_params(),
                                       navigation_request->request_params());
@@ -769,7 +770,6 @@ void NavigatorImpl::FailedNavigation(FrameTreeNode* frame_tree_node,
       render_frame_host, navigation_request->common_params().url);
 
   navigation_request->TransferNavigationHandleOwnership(render_frame_host);
-  delegate_->ReadyToCommitNavigation(render_frame_host->navigation_handle());
   render_frame_host->FailedNavigation(navigation_request->common_params(),
                                       navigation_request->request_params(),
                                       has_stale_copy_in_cache, error_code);