| Index: content/shell/renderer/test_runner/web_test_proxy.cc
|
| diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc
|
| index 989502b0100b59505e44d91b009e805486c0e7c3..3b6cf1b838c359fabf4a5fcee8f5f35bf2c2eec3 100644
|
| --- a/content/shell/renderer/test_runner/web_test_proxy.cc
|
| +++ b/content/shell/renderer/test_runner/web_test_proxy.cc
|
| @@ -1198,20 +1198,15 @@ void WebTestProxyBase::LocationChangeDone(blink::WebFrame* frame) {
|
| }
|
|
|
| blink::WebNavigationPolicy WebTestProxyBase::DecidePolicyForNavigation(
|
| - blink::WebLocalFrame* frame,
|
| - blink::WebDataSource::ExtraData* data,
|
| - const blink::WebURLRequest& request,
|
| - blink::WebNavigationType type,
|
| - blink::WebNavigationPolicy default_policy,
|
| - bool is_redirect) {
|
| + const blink::WebFrameClient::NavigationPolicyInfo& info) {
|
| blink::WebNavigationPolicy result;
|
| if (!test_interfaces_->testRunner()->policyDelegateEnabled())
|
| - return default_policy;
|
| + return info.defaultPolicy;
|
|
|
| delegate_->printMessage(std::string("Policy delegate: attempt to load ") +
|
| - URLDescription(request.url()) +
|
| + URLDescription(info.urlRequest.url()) +
|
| " with navigation type '" +
|
| - WebNavigationTypeToString(type) + "'\n");
|
| + WebNavigationTypeToString(info.navigationType) + "'\n");
|
| if (test_interfaces_->testRunner()->policyDelegateIsPermissive())
|
| result = blink::WebNavigationPolicyCurrentTab;
|
| else
|
|
|