Drop replacesCurrentHistoryItem, NavigationType

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index f20abcf564e0fe33dc3d7ba9d89260e36cdd8d40..198cb0222e6a494da43e45037ee5c5af22f1d92a 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -922,8 +922,8 @@ void WebLocalFrameImpl::setReferrerForRequest(WebURLRequest& request,
 }
 
 void WebLocalFrameImpl::dispatchWillSendRequest(WebURLRequest& request) {
-  frame()->loader().client()->dispatchWillSendRequest(
-      request.toMutableResourceRequest());
+  frame()->loader().client()->willSendRequest(
+      request.toMutableResourceRequest(), FrameLoadTypeStandard);
 }
 
 WebAssociatedURLLoader* WebLocalFrameImpl::createAssociatedURLLoader(
@@ -1631,19 +1631,19 @@ LocalFrame* WebLocalFrameImpl::createChildFrame(
   // If we're moving in the back/forward list, we might want to replace the
   // content of this child frame with whatever was there at that point.
   HistoryItem* childItem = nullptr;
+  FrameLoadType loadType = FrameLoadTypeStandard;
   if (isBackForwardLoadType(frame()->loader().documentLoader()->loadType()) &&
-      !frame()->document()->loadEventFinished())
+      !frame()->document()->loadEventFinished()) {
     childItem = webframeChild->client()->historyItemForNewChildFrame();
-
-  FrameLoadRequest newRequest = request;
-  FrameLoadType loadType = FrameLoadTypeStandard;
-  if (childItem) {
-    newRequest = FrameLoadRequest(
-        request.originDocument(),
-        FrameLoader::resourceRequestFromHistoryItem(
-            childItem, WebCachePolicy::UseProtocolCachePolicy));
     loadType = FrameLoadTypeInitialHistoryLoad;
   }
+
+  FrameLoadRequest newRequest =
+      childItem ? FrameLoadRequest(
+                      request.originDocument(),
+                      FrameLoader::resourceRequestFromHistoryItem(
+                          childItem, WebCachePolicy::UseProtocolCachePolicy))
+                : request;
   webframeChild->frame()->loader().load(newRequest, loadType, childItem);
 
   // Note a synchronous navigation (about:blank) would have already processed