Remove WebContentsObserver::DidCommitNavigation

content/browser/frame_host/navigation_handle_impl.cc

 // Copyright 2015 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/navigation_handle_impl.h"
 
 #include "content/browser/frame_host/navigator_delegate.h"
 #include "net/url_request/redirect_info.h"
 
 namespace content {
 
 // static
 scoped_ptr<NavigationHandleImpl> NavigationHandleImpl::Create(
     const GURL& url,
     const bool is_main_frame,
     NavigatorDelegate* delegate) {
   return scoped_ptr<NavigationHandleImpl>(
       new NavigationHandleImpl(url, is_main_frame, delegate));
 }
 
 NavigationHandleImpl::NavigationHandleImpl(const GURL& url,
                                            const bool is_main_frame,
                                            NavigatorDelegate* delegate)
     : url_(url),
       net_error_code_(net::OK),
       state_(DID_START),
       is_main_frame_(is_main_frame),
+      render_frame_host_(nullptr),
       is_same_page_(false),
       is_transferring_(false),
       delegate_(delegate) {
   delegate_->DidStartNavigation(this);
 }
 
 NavigationHandleImpl::~NavigationHandleImpl() {
   delegate_->DidFinishNavigation(this);
 }
 
 const GURL& NavigationHandleImpl::GetURL() const {
   return url_;
 }
 
 net::Error NavigationHandleImpl::GetNetErrorCode() const {
   return net_error_code_;
 }
 
 bool NavigationHandleImpl::IsInMainFrame() const {
   return is_main_frame_;
 }
 
+RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() {
+  CHECK(state_ >= READY_TO_COMMIT)
+      << "This accessor should only be called "
+         "after the navigation is ready to commit.";
+  return render_frame_host_;
+}
+
 bool NavigationHandleImpl::IsSamePage() {
   DCHECK(state_ == DID_COMMIT || state_ == DID_COMMIT_ERROR_PAGE)
       << "This accessor should not be called before the navigation has "
          "committed.";
   return is_same_page_;
 }
 
-bool NavigationHandleImpl::HasCommittedDocument() const {
-  return state_ == DID_COMMIT;
+bool NavigationHandleImpl::HasCommitted() {
+  return state_ == DID_COMMIT || state_ == DID_COMMIT_ERROR_PAGE;
 }
 
-bool NavigationHandleImpl::HasCommittedErrorPage() const {
+bool NavigationHandleImpl::IsErrorPage() {
   return state_ == DID_COMMIT_ERROR_PAGE;
 }
 
 void NavigationHandleImpl::DidRedirectNavigation(const GURL& new_url) {
   url_ = new_url;
   delegate_->DidRedirectNavigation(this);
 }
 
-void NavigationHandleImpl::DidCommitNavigation(bool same_page) {
+void NavigationHandleImpl::ReadyToCommitNavigation(
+    RenderFrameHostImpl* render_frame_host) {
+  CHECK(!render_frame_host_);
+  render_frame_host_ = render_frame_host;
+  state_ = READY_TO_COMMIT;
+  delegate_->ReadyToCommitNavigation(this);
+}
+
+void NavigationHandleImpl::DidCommitNavigation(
+    bool same_page,
+    RenderFrameHostImpl* render_frame_host) {
+  CHECK_IMPLIES(render_frame_host_, render_frame_host_ == render_frame_host);
   is_same_page_ = same_page;
+  render_frame_host_ = render_frame_host;
   state_ = net_error_code_ == net::OK ? DID_COMMIT : DID_COMMIT_ERROR_PAGE;
-  delegate_->DidCommitNavigation(this);
 }
 
 }  // namespace content