Drop replacesCurrentHistoryItem, NavigationType

third_party/WebKit/Source/core/loader/FrameLoaderClient.h

Index: third_party/WebKit/Source/core/loader/FrameLoaderClient.h
diff --git a/third_party/WebKit/Source/core/loader/FrameLoaderClient.h b/third_party/WebKit/Source/core/loader/FrameLoaderClient.h
index 11a310ea379c606b9cbc55578d582dc5f8ce03f3..b334f25fc98bc445acf418afb44690b3162e5e36 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoaderClient.h
+++ b/third_party/WebKit/Source/core/loader/FrameLoaderClient.h
@@ -90,7 +90,7 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
 
   virtual bool hasWebView() const = 0;  // mainly for assertions
 
-  virtual void dispatchWillSendRequest(ResourceRequest&) = 0;
+  virtual void willSendRequest(ResourceRequest&, FrameLoadType) = 0;
   virtual void dispatchDidReceiveResponse(const ResourceResponse&) = 0;
   virtual void dispatchDidLoadResourceFromMemoryCache(
       const ResourceRequest&,
@@ -98,14 +98,19 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
 
   virtual void dispatchDidHandleOnloadEvents() = 0;
   virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0;
-  virtual void dispatchDidNavigateWithinPage(HistoryItem*,
-                                             HistoryCommitType,
-                                             bool contentInitiated) {}
+  virtual void didNavigateWithinPage(DocumentLoader*,
+                                     FrameLoadType,
+                                     HistoryItem*,
+                                     HistoryCommitType,
+                                     bool contentInitiated) {}
   virtual void dispatchWillCommitProvisionalLoad() = 0;
-  virtual void dispatchDidStartProvisionalLoad() = 0;
+  virtual void didStartProvisionalLoad(DocumentLoader*, FrameLoadType) = 0;
   virtual void dispatchDidReceiveTitle(const String&) = 0;
   virtual void dispatchDidChangeIcons(IconType) = 0;
-  virtual void dispatchDidCommitLoad(HistoryItem*, HistoryCommitType) = 0;
+  virtual void didCommitProvisionalLoad(DocumentLoader*,
+                                        FrameLoadType,
+                                        HistoryItem*,
+                                        HistoryCommitType) = 0;
   virtual void dispatchDidFailProvisionalLoad(const ResourceError&,
                                               HistoryCommitType) = 0;
   virtual void dispatchDidFailLoad(const ResourceError&, HistoryCommitType) = 0;
@@ -113,14 +118,12 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
   virtual void dispatchDidFinishLoad() = 0;
   virtual void dispatchDidChangeThemeColor() = 0;
 
-  virtual NavigationPolicy decidePolicyForNavigation(
-      const ResourceRequest&,
-      DocumentLoader*,
-      NavigationType,
-      NavigationPolicy,
-      bool shouldReplaceCurrentEntry,
-      bool isClientRedirect,
-      HTMLFormElement*) = 0;
+  virtual NavigationPolicy decidePolicyForNavigation(const ResourceRequest&,
+                                                     DocumentLoader*,
+                                                     NavigationPolicy,
+                                                     FrameLoadType,
+                                                     bool isClientRedirect,
+                                                     HTMLFormElement*) = 0;
 
   virtual void dispatchWillSendSubmitEvent(HTMLFormElement*) = 0;
   virtual void dispatchWillSubmitForm(HTMLFormElement*) = 0;
@@ -132,7 +135,7 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
   virtual void loadURLExternally(const ResourceRequest&,
                                  NavigationPolicy,
                                  const String& suggestedName,
-                                 bool replacesCurrentHistoryItem) = 0;
+                                 FrameLoadType) = 0;
   virtual void loadErrorPage(int reason) = 0;
 
   virtual bool navigateBackForward(int offset) const = 0;