Drop replacesCurrentHistoryItem, NavigationType

components/test_runner/web_frame_test_proxy.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 COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
 
 #include <memory>
 #include <utility>
 
@@ skipping 71 matching lines @@
 
   bool canCreatePluginWithoutRenderer(
       const blink::WebString& mime_type) override {
     const char suffix[] = "-can-create-without-renderer";
     return mime_type.utf8().find(suffix) != std::string::npos;
   }
 
   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(
       blink::WebLocalFrame* frame) override {
     test_client()->didReceiveServerRedirectForProvisionalLoad(frame);
     Base::didReceiveServerRedirectForProvisionalLoad(frame);
   }
 
   void didFailProvisionalLoad(
       blink::WebLocalFrame* frame,
       const blink::WebURLError& error,
       blink::WebHistoryCommitType commit_type) override {
     test_client()->didFailProvisionalLoad(frame, error, commit_type);
     // If the test finished, don't notify the embedder of the failed load,
     // as we already destroyed the document loader.
     if (!frame->provisionalDataSource())
       return;
     Base::didFailProvisionalLoad(frame, error, commit_type);
   }
 
   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,
                        const blink::WebString& title,
                        blink::WebTextDirection direction) override {
     test_client()->didReceiveTitle(frame, title, direction);
     Base::didReceiveTitle(frame, title, direction);
   }
 
   void didChangeIcon(blink::WebLocalFrame* frame,
@@ skipping 17 matching lines @@
                    blink::WebHistoryCommitType commit_type) override {
     test_client()->didFailLoad(frame, error, commit_type);
     Base::didFailLoad(frame, error, commit_type);
   }
 
   void didFinishLoad(blink::WebLocalFrame* frame) override {
     Base::didFinishLoad(frame);
     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 {
     Base::didStopLoading();
     test_client()->didStopLoading();
   }
 
   void didChangeSelection(bool is_selection_empty) override {
     test_client()->didChangeSelection(is_selection_empty);
     Base::didChangeSelection(is_selection_empty);
@@ skipping 49 matching lines @@
   }
 
   void didDispatchPingLoader(const blink::WebURL& url) override {
     // This is not implemented in RenderFrameImpl, so need to explicitly call
     // into the base proxy.
     test_client()->didDispatchPingLoader(url);
     Base::didDispatchPingLoader(url);
   }
 
   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 {
     test_client()->didReceiveResponse(response);
     Base::didReceiveResponse(response);
   }
 
   blink::WebNavigationPolicy decidePolicyForNavigation(
       const blink::WebFrameClient::NavigationPolicyInfo& info) override {
     blink::WebNavigationPolicy policy =
@@ skipping 42 matching lines @@
     return test_client()->runFileChooser(params, completion);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_