| 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 434afea696e9f4349c5db8961f8b4e4b80d0723a..c34cad9252184620cef941954b33507cb5341282 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -8717,7 +8717,7 @@ TEST_P(ParameterizedWebFrameTest, EmbedderTriggeredDetachWithRemoteMainFrame) {
|
| FrameTestHelpers::CreateLocalChild(view->MainFrame()->ToWebRemoteFrame());
|
|
|
| // Purposely keep the LocalFrame alive so it's the last thing to be destroyed.
|
| - Persistent<Frame> child_core_frame = child_frame->ToImplBase()->GetFrame();
|
| + Persistent<Frame> child_core_frame = child_frame->GetFrame();
|
| view->Close();
|
| child_core_frame.Clear();
|
| }
|
| @@ -9412,7 +9412,7 @@ TEST_F(WebFrameSwapTest, WindowOpenOnRemoteFrame) {
|
| DOMWindow* result =
|
| main_window->open("", "frame1", "", main_window, main_window);
|
| EXPECT_EQ(remote_client.LastRequest().Url(), WebURL(destination));
|
| - EXPECT_EQ(result, remote_frame->ToImplBase()->GetFrame()->DomWindow());
|
| + EXPECT_EQ(result, remote_frame->GetFrame()->DomWindow());
|
|
|
| Reset();
|
| }
|
| @@ -9444,8 +9444,8 @@ TEST_F(WebFrameTest, WindowOpenRemoteClose) {
|
| web_remote_frame->SetReplicatedOrigin(
|
| WebSecurityOrigin::CreateFromString("http://127.0.0.1"));
|
|
|
| - LocalFrame* local_frame = ToLocalFrame(
|
| - main_web_view.WebView()->MainFrame()->ToImplBase()->GetFrame());
|
| + LocalFrame* local_frame =
|
| + ToLocalFrame(main_web_view.WebView()->MainFrame()->GetFrame());
|
| RemoteFrame* remote_frame = web_remote_frame->GetFrame();
|
|
|
| // Attempt to close the window, which should fail as it isn't opened
|
| @@ -9942,7 +9942,7 @@ TEST_P(ParameterizedWebFrameTest, SuspendedPageLoadWithRemoteMainFrame) {
|
|
|
| // Check that ScopedPageSuspender properly triggers deferred loading for
|
| // the current Page.
|
| - Page* page = remote_root->ToImplBase()->GetFrame()->GetPage();
|
| + Page* page = remote_root->GetFrame()->GetPage();
|
| EXPECT_FALSE(page->Suspended());
|
| {
|
| ScopedPageSuspender suspender;
|
|
|