Refactor FrameLoader loading interface

public/web/WebLocalFrame.h

 // Copyright 2014 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 WebLocalFrame_h
 #define WebLocalFrame_h
 
 #include "WebFrame.h"
+#include "WebFrameLoadType.h"
 
 namespace blink {
 
 enum class WebAppBannerPromptReply;
 enum class WebSandboxFlags;
 enum class WebTreeScopeType;
 class WebAutofillClient;
 class WebContentSettingsClient;
 class WebDevToolsAgent;
 class WebDevToolsAgentClient;
@@ skipping 34 matching lines @@
     virtual void initializeToReplaceRemoteFrame(WebRemoteFrame*, const WebString& name, WebSandboxFlags) = 0;
 
     virtual void setAutofillClient(WebAutofillClient*) = 0;
     virtual WebAutofillClient* autofillClient() = 0;
     virtual void setDevToolsAgentClient(WebDevToolsAgentClient*) = 0;
     virtual WebDevToolsAgent* devToolsAgent() = 0;
 
     // Navigation Ping --------------------------------------------------------
     virtual void sendPings(const WebNode& linkNode, const WebURL& destinationURL) = 0;
 
+    // Navigation ----------------------------------------------------------
+
+    // Returns a WebURLRequest corresponding to the load of the WebHistoryItem.
+    virtual WebURLRequest requestFromHistoryItem(const WebHistoryItem&, WebURLRequest::CachePolicy)
+        const = 0;
+
+    // Returns a WebURLRequest corresponding to the reload of the current
+    // HistoryItem.
+    virtual WebURLRequest requestForReload(WebFrameLoadType,
+        const WebURL& overrideURL = WebURL()) const = 0;
+
+    // Load the given URL. For history navigations, a valid WebHistoryItem
+    // should be given, as well as a WebHistoryLoadType.
+    // TODO(clamy): Remove the reload, reloadWithOverrideURL, loadHistoryItem
+    // loadRequest functions in WebFrame once RenderFrame only calls loadRequest.
+    virtual void load(const WebURLRequest&, WebFrameLoadType = WebFrameLoadType::Standard,
+        const WebHistoryItem& = WebHistoryItem(),
+        WebHistoryLoadType = WebHistoryDifferentDocumentLoad) = 0;
 
     // Navigation State -------------------------------------------------------
 
     // Returns true if the current frame's load event has not completed.
     virtual bool isLoading() const = 0;
 
     // Returns true if any resource load is currently in progress. Exposed
     // primarily for use in layout tests. You probably want isLoading()
     // instead.
     virtual bool isResourceLoadInProgress() const = 0;
@@ skipping 62 matching lines @@
     virtual void reloadImage(const WebNode&) = 0;
 
 protected:
     explicit WebLocalFrame(WebTreeScopeType scope) : WebFrame(scope) { }
 };
 
 } // namespace blink
 
 #endif // WebLocalFrame_h