Use WebFrame::loadRequest for reloads and history navigations

content/renderer/history_controller.h

Index: content/renderer/history_controller.h
diff --git a/content/renderer/history_controller.h b/content/renderer/history_controller.h
index 0a46eefa0d86fb96d5dbb7429cffdfccace67d71..d72cd44af1ff3c4854736ae1d3301ae2b88b81b0 100644
--- a/content/renderer/history_controller.h
+++ b/content/renderer/history_controller.h
@@ -41,13 +41,10 @@
 #include "content/common/content_export.h"
 #include "content/renderer/history_entry.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
+#include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 
-namespace blink {
-class WebFrame;
-}
-
 namespace content {
 class RenderFrameImpl;
 class RenderViewImpl;
@@ -114,6 +111,16 @@ class CONTENT_EXPORT HistoryController {
                  scoped_ptr<NavigationParams> navigation_params,
                  blink::WebURLRequest::CachePolicy cache_policy);
 
+  // Returns the WebHistoryItem corresponding to |target_entry|. If no item is

[Charlie Reis, 2015/05/27 23:34:36]

This sentence doesn't make sense, since a HistoryEntry has a tree of
HistoryItems.  There isn't one WebHistoryItem corresponding to it, unless you're
looking for the one that matches |target_frame|.

If that's the case, it sounds like we might be able to replace this method with
target_entry->GetItemForFrame(target_frame)?

[clamy, 2015/05/29 14:47:01]

Ah I didn't know we had this method. The only thing remaining is to determine if
the history load is a same document load or not, though I can assume it's always
a different document load for the moment in PlzNavigate.

+  // found, then returns an empty WebHistoryItem. Also updates load_type to

[Charlie Reis, 2015/05/27 23:34:36]

nit: |load_type|

I'm not a fan of methods that do multiple things (especially using both return
types and out parameters) if we can avoid it.

[clamy, 2015/05/29 14:47:01]

I'm removing the method in the next patch set.

+  // WebFrameLoadTypeBackForward or WebFrameLoadTypeHistorySameDocument
+  // depending on the type of history navigation.
+  blink::WebHistoryItem FindItemForFrame(

[Charlie Reis, 2015/05/27 23:34:36]

I'd like to avoid adding new code to HistoryController at this point if
possible, especially code that depends on RecursiveGoToEntry.  I'm on the brink
of moving that to the browser process.

[clamy, 2015/05/29 14:47:01]

Done.

+      scoped_ptr<HistoryEntry> target_entry,
+      RenderFrameImpl* target_frame,
+      blink::WebURLRequest::CachePolicy cache_policy,
+      blink::WebFrame::WebFrameLoadType* load_type);
+
   void UpdateForCommit(RenderFrameImpl* frame,
                        const blink::WebHistoryItem& item,
                        blink::WebHistoryCommitType commit_type,