Drop replacesCurrentHistoryItem, NavigationType

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index eb9372dfa1984812342848c7d93562e4b05cf238..28884c7701a811f4227f00745883a4672d030314 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -535,7 +535,7 @@ class CONTENT_EXPORT RenderFrameImpl
   void loadURLExternally(const blink::WebURLRequest& request,
                          blink::WebNavigationPolicy policy,
                          const blink::WebString& suggested_name,
-                         bool should_replace_current_entry) override;
+                         blink::WebFrameLoadType load_type) override;
   void loadErrorPage(int reason) override;
   blink::WebNavigationPolicy decidePolicyForNavigation(
       const NavigationPolicyInfo& info) override;
@@ -544,14 +544,16 @@ class CONTENT_EXPORT RenderFrameImpl
   void willSubmitForm(const blink::WebFormElement& form) override;
   void didCreateDataSource(blink::WebLocalFrame* frame,
                            blink::WebDataSource* datasource) override;
-  void didStartProvisionalLoad(blink::WebLocalFrame* frame) override;
+  void didStartProvisionalLoad(blink::WebDataSource* ds,
+                               blink::WebFrameLoadType type) override;
   void didReceiveServerRedirectForProvisionalLoad(
       blink::WebLocalFrame* frame) override;
   void didFailProvisionalLoad(blink::WebLocalFrame* frame,
                               const blink::WebURLError& error,
                               blink::WebHistoryCommitType commit_type) override;
   void didCommitProvisionalLoad(
-      blink::WebLocalFrame* frame,
+      blink::WebDataSource* data_source,
+      blink::WebFrameLoadType load_type,
       const blink::WebHistoryItem& item,
       blink::WebHistoryCommitType commit_type) override;
   void didCreateNewDocument(blink::WebLocalFrame* frame) override;
@@ -572,7 +574,8 @@ class CONTENT_EXPORT RenderFrameImpl
                    const blink::WebURLError& error,
                    blink::WebHistoryCommitType commit_type) override;
   void didFinishLoad(blink::WebLocalFrame* frame) override;
-  void didNavigateWithinPage(blink::WebLocalFrame* frame,
+  void didNavigateWithinPage(blink::WebDataSource* data_source,
+                             blink::WebFrameLoadType load_type,
                              const blink::WebHistoryItem& item,
                              blink::WebHistoryCommitType commit_type,
                              bool content_initiated) override;
@@ -598,7 +601,8 @@ class CONTENT_EXPORT RenderFrameImpl
   void showContextMenu(const blink::WebContextMenuData& data) override;
   void saveImageFromDataURL(const blink::WebString& data_url) override;
   void willSendRequest(blink::WebLocalFrame* frame,
-                       blink::WebURLRequest& request) override;
+                       blink::WebURLRequest& request,
+                       blink::WebFrameLoadType load_type) override;
   void didReceiveResponse(const blink::WebURLResponse& response) override;
   void didLoadResourceFromMemoryCache(
       const blink::WebURLRequest& request,
@@ -793,8 +797,8 @@ class CONTENT_EXPORT RenderFrameImpl
   const RenderFrameImpl* GetLocalRoot() const;
 
   // Builds and sends DidCommitProvisionalLoad to the host.
-  void SendDidCommitProvisionalLoad(blink::WebFrame* frame,
-                                    blink::WebHistoryCommitType commit_type,
+  void SendDidCommitProvisionalLoad(blink::WebDataSource* data_source,
+                                    blink::WebFrameLoadType load_type,
                                     const blink::WebHistoryItem& item);
 
   // Swaps the current frame into the frame tree, replacing the
@@ -936,8 +940,7 @@ class CONTENT_EXPORT RenderFrameImpl
       const std::string& extra_headers,
       const Referrer& referrer,
       blink::WebNavigationPolicy policy,
-      bool should_replace_current_entry,
-      bool is_history_navigation_in_new_child);
+      blink::WebFrameLoadType load_type);
 
   // Performs a navigation in the frame. This provides a unified function for
   // the current code path and the browser-side navigation path (in