| Index: content/shell/renderer/test_runner/web_test_proxy.h
|
| diff --git a/content/shell/renderer/test_runner/web_test_proxy.h b/content/shell/renderer/test_runner/web_test_proxy.h
|
| index 7a1c6d447d960cac284706ac70872a70bf58a740..2ead7037d0e87ff18a4146ba80a373c6b0938080 100644
|
| --- a/content/shell/renderer/test_runner/web_test_proxy.h
|
| +++ b/content/shell/renderer/test_runner/web_test_proxy.h
|
| @@ -23,6 +23,7 @@
|
| #include "third_party/WebKit/public/web/WebDataSource.h"
|
| #include "third_party/WebKit/public/web/WebDragOperation.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| +#include "third_party/WebKit/public/web/WebFrameClient.h"
|
| #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
|
| #include "third_party/WebKit/public/web/WebIconURL.h"
|
| #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
|
| @@ -230,12 +231,7 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
|
| int intra_priority_value);
|
| void DidFinishResourceLoad(blink::WebLocalFrame* frame, unsigned identifier);
|
| blink::WebNavigationPolicy DecidePolicyForNavigation(
|
| - blink::WebLocalFrame* frame,
|
| - blink::WebDataSource::ExtraData* data,
|
| - const blink::WebURLRequest& request,
|
| - blink::WebNavigationType navigation_type,
|
| - blink::WebNavigationPolicy default_policy,
|
| - bool is_redirect);
|
| + const blink::WebFrameClient::NavigationPolicyInfo& info);
|
| bool WillCheckAndDispatchMessageEvent(blink::WebLocalFrame* source_frame,
|
| blink::WebFrame* target_frame,
|
| blink::WebSecurityOrigin target,
|
|
|