Index: content/shell/renderer/test_runner/web_frame_test_proxy.h |
diff --git a/content/shell/renderer/test_runner/web_frame_test_proxy.h b/content/shell/renderer/test_runner/web_frame_test_proxy.h |
index 9d355f22f630233c99b97250d1a1938287a958c4..a280199c46eb452711b3e9602e70f43c438f8fd9 100644 |
--- a/content/shell/renderer/test_runner/web_frame_test_proxy.h |
+++ b/content/shell/renderer/test_runner/web_frame_test_proxy.h |
@@ -66,9 +66,10 @@ class WebFrameTestProxy : public Base { |
Base::loadURLExternally(frame, request, policy, suggested_name); |
} |
- virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame) { |
+ virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame, |
+ bool isTransitionNavigation) { |
base_proxy_->DidStartProvisionalLoad(frame); |
- Base::didStartProvisionalLoad(frame); |
+ Base::didStartProvisionalLoad(frame, isTransitionNavigation); |
} |
virtual void didReceiveServerRedirectForProvisionalLoad( |
@@ -244,19 +245,13 @@ class WebFrameTestProxy : public Base { |
} |
virtual blink::WebNavigationPolicy decidePolicyForNavigation( |
- blink::WebLocalFrame* frame, |
- blink::WebDataSource::ExtraData* extra_data, |
- const blink::WebURLRequest& request, |
- blink::WebNavigationType type, |
- blink::WebNavigationPolicy default_policy, |
- bool is_redirect) { |
+ const blink::WebFrameClient::NavigationPolicyInfo& info) { |
blink::WebNavigationPolicy policy = base_proxy_->DecidePolicyForNavigation( |
- frame, extra_data, request, type, default_policy, is_redirect); |
+ info); |
if (policy == blink::WebNavigationPolicyIgnore) |
return policy; |
- return Base::decidePolicyForNavigation( |
- frame, extra_data, request, type, default_policy, is_redirect); |
+ return Base::decidePolicyForNavigation(info); |
} |
virtual void willStartUsingPeerConnectionHandler( |