| Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| index b32fcc1acb9da6242273a65169a6841ba8c3610c..a324aba06f9857d2dab9d76f03a272d88e3fd15a 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -7419,7 +7419,8 @@ class TestHistoryWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
|
| m_replacesCurrentHistoryItem = false;
|
| }
|
|
|
| - void didStartProvisionalLoad(WebDataSource* dataSource,
|
| + void didStartProvisionalLoad(WebLocalFrame* initiatorFrame,
|
| + WebDataSource* dataSource,
|
| WebURLRequest& request) {
|
| m_replacesCurrentHistoryItem = dataSource->replacesCurrentHistoryItem();
|
| }
|
| @@ -9154,7 +9155,8 @@ TEST_F(WebFrameSwapTest, HistoryCommitTypeAfterExistingRemoteToLocalSwap) {
|
| class RemoteNavigationClient
|
| : public FrameTestHelpers::TestWebRemoteFrameClient {
|
| public:
|
| - void navigate(const WebURLRequest& request,
|
| + void navigate(WebLocalFrame* initiatorFrame,
|
| + const WebURLRequest& request,
|
| bool shouldReplaceCurrentEntry) override {
|
| m_lastRequest = request;
|
| }
|
| @@ -10129,7 +10131,9 @@ class CallbackOrderingWebFrameClient
|
| EXPECT_EQ(0, m_callbackCount++);
|
| FrameTestHelpers::TestWebFrameClient::didStartLoading(toDifferentDocument);
|
| }
|
| - void didStartProvisionalLoad(WebDataSource*, WebURLRequest&) override {
|
| + void didStartProvisionalLoad(WebLocalFrame* initiatorFrame,
|
| + WebDataSource*,
|
| + WebURLRequest&) override {
|
| EXPECT_EQ(1, m_callbackCount++);
|
| }
|
| void didCommitProvisionalLoad(WebLocalFrame*,
|
|
|