| Index: Source/web/tests/WebFrameTest.cpp
|
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
|
| index 7ec49c36674ca3ab4768b7464b26e7f0e0950cad..84459ef3e5e7dea00cbd90e9e1a7c03eee6455a6 100644
|
| --- a/Source/web/tests/WebFrameTest.cpp
|
| +++ b/Source/web/tests/WebFrameTest.cpp
|
| @@ -2641,11 +2641,9 @@ TEST_F(WebFrameTest, DivScrollIntoEditableTest)
|
|
|
| class TestReloadDoesntRedirectWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
|
| public:
|
| - virtual WebNavigationPolicy decidePolicyForNavigation(
|
| - WebLocalFrame*, WebDataSource::ExtraData*, const WebURLRequest&, WebNavigationType,
|
| - WebNavigationPolicy defaultPolicy, bool isRedirect) OVERRIDE
|
| + virtual WebNavigationPolicy decidePolicyForNavigation(const NavigationPolicyInfo& info) OVERRIDE
|
| {
|
| - EXPECT_FALSE(isRedirect);
|
| + EXPECT_FALSE(info.isRedirect);
|
| return WebNavigationPolicyCurrentTab;
|
| }
|
| };
|
| @@ -4817,11 +4815,10 @@ public:
|
| {
|
| }
|
|
|
| - virtual WebNavigationPolicy decidePolicyForNavigation(WebLocalFrame*, WebDataSource::ExtraData*, const WebURLRequest&,
|
| - WebNavigationType, WebNavigationPolicy policy, bool) OVERRIDE
|
| + virtual WebNavigationPolicy decidePolicyForNavigation(const NavigationPolicyInfo& info) OVERRIDE
|
| {
|
| m_decidePolicyCallCount++;
|
| - return policy;
|
| + return info.defaultPolicy;
|
| }
|
|
|
| int decidePolicyCallCount() const { return m_decidePolicyCallCount; }
|
| @@ -5171,7 +5168,8 @@ public:
|
| m_replacesCurrentHistoryItem = false;
|
| m_frame = 0;
|
| }
|
| - void didStartProvisionalLoad(WebLocalFrame* frame)
|
| +
|
| + void didStartProvisionalLoad(WebLocalFrame* frame, bool isTransitionNavigation)
|
| {
|
| WebDataSource* ds = frame->provisionalDataSource();
|
| m_replacesCurrentHistoryItem = ds->replacesCurrentHistoryItem();
|
|
|