Remove WebContentsObserver::DidCommitNavigation

content/browser/frame_host/navigation_handle_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 
 #include "content/public/browser/navigation_handle.h"
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/common/content_export.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class NavigatorDelegate;
 struct NavigationRequestInfo;
 
 // This class keeps track of a single navigation. It is created upon receipt of
 // a DidStartProvisionalLoad IPC in a RenderFrameHost. The RenderFrameHost owns
@@ skipping 33 matching lines @@
   static scoped_ptr<NavigationHandleImpl> Create(const GURL& url,
                                                  const bool is_main_frame,
                                                  NavigatorDelegate* delegate);
 
   ~NavigationHandleImpl() override;
 
   // NavigationHandle implementation:
   const GURL& GetURL() const override;
   net::Error GetNetErrorCode() const override;
   bool IsInMainFrame() const override;
+  RenderFrameHostImpl* GetRenderFrameHost() override;
   bool IsSamePage() override;
-  bool HasCommittedDocument() const override;
-  bool HasCommittedErrorPage() const override;
+  bool HasCommitted() override;
+  bool IsErrorPage() override;
 
   void set_net_error_code(net::Error net_error_code) {
     net_error_code_ = net_error_code;
   }
 
   // Returns whether the navigation is currently being transferred from one
   // RenderFrameHost to another. In particular, a DidStartProvisionalLoad IPC
   // for the navigation URL, received in the new RenderFrameHost, should not
   // indicate the start of a new navigation in that case.
   bool is_transferring() const { return is_transferring_; }
   void set_is_transferring(bool is_transferring) {
     is_transferring_ = is_transferring;
   }
 
   // Called when the navigation was redirected. This will update the |url_| and
   // inform the delegate.
   void DidRedirectNavigation(const GURL& new_url);
 
-  // Called when the navigation was committed. This will update the |state_|
-  // and inform the delegate,
-  void DidCommitNavigation(bool same_page);
+  // Called when the navigation is ready to be committed in
+  // |render_frame_host|. This will update the |state_| and inform the
+  // delegate.
+  void ReadyToCommitNavigation(RenderFrameHostImpl* render_frame_host);
+
+  // Called when the navigation was committed in |render_frame_host|. This will
+  // update the |state_|.
+  void DidCommitNavigation(bool same_page,
+                           RenderFrameHostImpl* render_frame_host);
 
  private:
   // Used to track the state the navigation is currently in.
   enum State {
     DID_START = 0,
+    READY_TO_COMMIT,
     DID_COMMIT,
     DID_COMMIT_ERROR_PAGE,
   };
 
   NavigationHandleImpl(const GURL& url,
                        const bool is_main_frame,
                        NavigatorDelegate* delegate);
 
   // See NavigationHandle for a description of those member variables.
   GURL url_;
   net::Error net_error_code_;
   State state_;
   const bool is_main_frame_;
+  RenderFrameHostImpl* render_frame_host_;
   bool is_same_page_;
 
   // Whether the navigation is in the middle of a transfer. Set to false when
   // the DidStartProvisionalLoad is received from the new renderer.
   bool is_transferring_;
 
   // The delegate that should be notified about events related to this
   // navigation.
   NavigatorDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_