| 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 8d9271a166ab2f633f91ca3f8b5aaf97d3c060e1..a05ca7b4d0a4803ea8c4d116d78556fc67a03bd6 100644
|
| --- a/content/shell/renderer/test_runner/web_frame_test_proxy.h
|
| +++ b/content/shell/renderer/test_runner/web_frame_test_proxy.h
|
| @@ -64,9 +64,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(
|
| @@ -238,15 +239,13 @@ class WebFrameTestProxy : public Base {
|
| }
|
|
|
| virtual blink::WebNavigationPolicy decidePolicyForNavigation(
|
| - blink::WebLocalFrame* frame, blink::WebDataSource::ExtraData* extraData,
|
| - const blink::WebURLRequest& request, blink::WebNavigationType type,
|
| - blink::WebNavigationPolicy defaultPolicy, bool isRedirect) {
|
| + const blink::WebFrameClient::NavigationPolicyInfo& info) {
|
| blink::WebNavigationPolicy policy = base_proxy_->DecidePolicyForNavigation(
|
| - frame, extraData, request, type, defaultPolicy, isRedirect);
|
| + info.frame, info.extraData, info.urlRequest, info.navigationType,
|
| + info.defaultPolicy, info.isRedirect);
|
| if (policy == blink::WebNavigationPolicyIgnore) return policy;
|
|
|
| - return Base::decidePolicyForNavigation(frame, extraData, request, type,
|
| - defaultPolicy, isRedirect);
|
| + return Base::decidePolicyForNavigation(info);
|
| }
|
|
|
| virtual void willStartUsingPeerConnectionHandler(
|
|
|