Drop replacesCurrentHistoryItem, NavigationType

components/test_runner/web_frame_test_proxy.h

Index: components/test_runner/web_frame_test_proxy.h
diff --git a/components/test_runner/web_frame_test_proxy.h b/components/test_runner/web_frame_test_proxy.h
index ac444304046335918db5624824178fd29d0a7339..4f29a45e8cdb620e3a5859070a972f296cdac4ba 100644
--- a/components/test_runner/web_frame_test_proxy.h
+++ b/components/test_runner/web_frame_test_proxy.h
@@ -89,16 +89,16 @@ class WebFrameTestProxy : public Base, public WebFrameTestProxyBase {
   void loadURLExternally(const blink::WebURLRequest& request,
                          blink::WebNavigationPolicy policy,
                          const blink::WebString& suggested_name,
-                         bool replaces_current_history_item) override {
+                         blink::WebFrameLoadType load_type) override {
     test_client()->loadURLExternally(request, policy, suggested_name,
-                                     replaces_current_history_item);
-    Base::loadURLExternally(request, policy, suggested_name,
-                            replaces_current_history_item);
+                                     load_type);
+    Base::loadURLExternally(request, policy, suggested_name, load_type);
   }
 
-  void didStartProvisionalLoad(blink::WebLocalFrame* frame) override {
-    test_client()->didStartProvisionalLoad(frame);
-    Base::didStartProvisionalLoad(frame);
+  void didStartProvisionalLoad(blink::WebDataSource* data_source,
+                               blink::WebFrameLoadType load_type) override {
+    test_client()->didStartProvisionalLoad(data_source, load_type);
+    Base::didStartProvisionalLoad(data_source, load_type);
   }
 
   void didReceiveServerRedirectForProvisionalLoad(
@@ -120,11 +120,13 @@ class WebFrameTestProxy : public Base, public WebFrameTestProxyBase {
   }
 
   void didCommitProvisionalLoad(
-      blink::WebLocalFrame* frame,
+      blink::WebDataSource* data_source,
+      blink::WebFrameLoadType load_type,
       const blink::WebHistoryItem& item,
       blink::WebHistoryCommitType commit_type) override {
-    test_client()->didCommitProvisionalLoad(frame, item, commit_type);
-    Base::didCommitProvisionalLoad(frame, item, commit_type);
+    test_client()->didCommitProvisionalLoad(data_source, load_type, item,
+                                            commit_type);
+    Base::didCommitProvisionalLoad(data_source, load_type, item, commit_type);
   }
 
   void didReceiveTitle(blink::WebLocalFrame* frame,
@@ -162,14 +164,15 @@ class WebFrameTestProxy : public Base, public WebFrameTestProxyBase {
     test_client()->didFinishLoad(frame);
   }
 
-  void didNavigateWithinPage(blink::WebLocalFrame* frame,
+  void didNavigateWithinPage(blink::WebDataSource* data_source,
+                             blink::WebFrameLoadType load_type,
                              const blink::WebHistoryItem& history_item,
                              blink::WebHistoryCommitType commit_type,
                              bool content_initiated) override {
-    Base::didNavigateWithinPage(frame, history_item, commit_type,
-                                content_initiated);
-    test_client()->didNavigateWithinPage(frame, history_item, commit_type,
-                                         content_initiated);
+    Base::didNavigateWithinPage(data_source, load_type, history_item,
+                                commit_type, content_initiated);
+    test_client()->didNavigateWithinPage(data_source, load_type, history_item,
+                                         commit_type, content_initiated);
   }
 
   void didStopLoading() override {
@@ -239,9 +242,10 @@ class WebFrameTestProxy : public Base, public WebFrameTestProxyBase {
   }
 
   void willSendRequest(blink::WebLocalFrame* frame,
-                       blink::WebURLRequest& request) override {
-    Base::willSendRequest(frame, request);
-    test_client()->willSendRequest(frame, request);
+                       blink::WebURLRequest& request,
+                       blink::WebFrameLoadType load_type) override {
+    Base::willSendRequest(frame, request, load_type);
+    test_client()->willSendRequest(frame, request, load_type);
   }
 
   void didReceiveResponse(const blink::WebURLResponse& response) override {